]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'mvebu/dt' into for-next
authorJason Cooper <jason@lakedaemon.net>
Mon, 20 May 2013 20:28:11 +0000 (20:28 +0000)
committerJason Cooper <jason@lakedaemon.net>
Mon, 20 May 2013 20:28:11 +0000 (20:28 +0000)
1  2 
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

Simple merge