]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'mvebu/dt' into for-next
authorJason Cooper <jason@lakedaemon.net>
Mon, 19 Aug 2013 21:28:44 +0000 (21:28 +0000)
committerJason Cooper <jason@lakedaemon.net>
Mon, 19 Aug 2013 21:28:44 +0000 (21:28 +0000)
commitf34943eae9f389e5f58324b0424639ea12386c8f
tree6df99f93000306bd6f0adbeedb7dac74a1c35fa0
parentfaa7403b6bba3a2ef8114f60340b60cdc7c0b84e
parent5d3b883071763e6448386b875f04fcb201b6e12d
Merge branch 'mvebu/dt' into for-next

Conflicts:
arch/arm/boot/dts/kirkwood-nsa310.dts
arch/arm/boot/dts/Makefile
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/arm/boot/dts/armada-xp.dtsi
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
arch/arm/boot/dts/kirkwood-nsa310.dts