tree 9665b5fed230b7092e9b221afbb54488cbc72a62
parent b8be3a227949202cdc9e1d7c35509f916a1aa327
parent 96039f735e290281d0c8a08fc467de2cd610543d
author Olof Johansson <olof@lixom.net> 1385927484 -0800
committer Olof Johansson <olof@lixom.net> 1386103149 -0800

Merge tag 'mvebu-dt-fixes-3.13' of git://git.infradead.org/linux-mvebu into fixes

From Jason Cooper, mvebu DT fixes for v3.13:
 - mvebu
    - PCIe fixes now that we have test devices with more ports.
    - fix access to coherency registers

* tag 'mvebu-dt-fixes-3.13' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: re-enable PCIe on Armada 370 DB
  ARM: mvebu: use the virtual CPU registers to access coherency registers
  ARM: mvebu: fix second and third PCIe unit of Armada XP mv78260
  ARM: mvebu: second PCIe unit of Armada XP mv78230 is only x1 capable