]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge branch 'mvebu/dt' into for-next
authorJason Cooper <jason@lakedaemon.net>
Tue, 14 Jan 2014 02:37:50 +0000 (02:37 +0000)
committerJason Cooper <jason@lakedaemon.net>
Tue, 14 Jan 2014 02:37:50 +0000 (02:37 +0000)
commitec7d4be690a20b5bdbe56f57bafc728af9592880
treeb2756ff543ca8818289dd880adf776ac49501579
parentb0869221326114c0d77f40c5767677b34fd993ce
parent57d647cf8d32f52a505bc51c34f8074f06f00b03
Merge branch 'mvebu/dt' into for-next

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