From: Olof Johansson <olof@lixom.net>
Date: Sun, 1 Dec 2013 19:51:24 +0000 (-0800)
Subject: Merge tag 'mvebu-dt-fixes-3.13' of git://git.infradead.org/linux-mvebu into fixes
X-Git-Tag: firefly_0821_release~176^2~4691^2~27
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c0c3350c3c1171f7aff7373c658aa7d68975bd55;p=firefly-linux-kernel-4.4.55.git

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
---

c0c3350c3c1171f7aff7373c658aa7d68975bd55