]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'mvebu/dt' into for-next
authorJason Cooper <jason@lakedaemon.net>
Thu, 2 Jan 2014 15:17:41 +0000 (15:17 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 2 Jan 2014 15:17:41 +0000 (15:17 +0000)
commit6da7d0ea74e4855d468cb65047ce411759ad593d
treed9bc7fd23eacebed0fc4e5f2181e356d79d91345
parentea0dc3492091da3d4438e4f7e8dd61f8d12b9c75
parent1dc93110090c230f013e8e1a3a1aa3ce76a5adca
Merge branch 'mvebu/dt' into for-next

Conflicts:
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/armada-370-xp.dtsi