Merge tag 'mvebu-dt-fixes-3.15-2' of git://git.infradead.org/linux-mvebu into fixes
authorOlof Johansson <olof@lixom.net>
Sun, 11 May 2014 03:22:29 +0000 (20:22 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 11 May 2014 03:22:29 +0000 (20:22 -0700)
commite5e49fe9dfe33beabd0af593870cc9247ba481a6
tree4587113322d99b4e473694a0c6e58a2dcf648a55
parent90f4c5944b38b4647373db7a57a2dda1e0c5566a
parent788296b2d19d16ec33aba0a5ad1544d50bb58601
Merge tag 'mvebu-dt-fixes-3.15-2' of git://git.infradead.org/linux-mvebu into fixes

Merge 'ARM: mvebu: DT fixes for v3.15 (incr #2)' from Jason Cooper:

mvebu DT fixes for v3.15 (incremental #2)

 - kirkwood: fix mis-located pcie controller nodes

* tag 'mvebu-dt-fixes-3.15-2' of git://git.infradead.org/linux-mvebu:
  ARM: dts: kirkwood: fix mislocated pcie-controller nodes

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts