]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'mvebu/msi_mvebu' into for-next
authorJason Cooper <jason@lakedaemon.net>
Mon, 19 Aug 2013 21:27:30 +0000 (21:27 +0000)
committerJason Cooper <jason@lakedaemon.net>
Mon, 19 Aug 2013 21:27:30 +0000 (21:27 +0000)
commitf24db0ae79dd0816e06ce4e06b7784882346b8f3
treec54e630c56b85457048756b74c63b089cccbdc7c
parent9c853c052b35354f94159e0ab56663af2d1a1c83
parent57f1eafe6952ee3ebe5f16c850b497e3ca2b3d04
Merge branch 'mvebu/msi_mvebu' into for-next

Conflicts:
Documentation/devicetree/bindings/pci/mvebu-pci.txt
arch/arm/boot/dts/armada-370.dtsi
arch/arm/boot/dts/armada-xp-mv78230.dtsi
arch/arm/boot/dts/armada-xp-mv78260.dtsi
arch/arm/boot/dts/armada-xp-mv78460.dtsi
drivers/pci/host/pci-mvebu.c
Documentation/devicetree/bindings/pci/mvebu-pci.txt
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/armada-370.dtsi
arch/arm/boot/dts/armada-xp-mv78230.dtsi
arch/arm/boot/dts/armada-xp-mv78260.dtsi
arch/arm/boot/dts/armada-xp-mv78460.dtsi
drivers/pci/host/pci-mvebu.c