]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'mvebu/msi_mvebu' into mvebu/dove_pcie-mbus-dt
authorJason Cooper <jason@lakedaemon.net>
Tue, 13 Aug 2013 18:19:45 +0000 (18:19 +0000)
committerJason Cooper <jason@lakedaemon.net>
Tue, 13 Aug 2013 18:19:45 +0000 (18:19 +0000)
commitcff8975f9f6bfff4e7837118c9057570edbc7c1a
tree0522c3dd27ecba5f502fe2061b0cb07c0ee01e34
parente8b948e25c180fb3119cb58a33c956e988569302
parent57f1eafe6952ee3ebe5f16c850b497e3ca2b3d04
Merge branch 'mvebu/msi_mvebu' into mvebu/dove_pcie-mbus-dt

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
arch/mips/Kconfig
arch/x86/kernel/x86_init.c
drivers/pci/host/pci-mvebu.c