]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'marvell-boards-net-for-3.8' of git://github.com/MISL-EBU-System-SW/mainlin...
authorJason Cooper <jason@lakedaemon.net>
Wed, 21 Nov 2012 19:51:14 +0000 (19:51 +0000)
committerJason Cooper <jason@lakedaemon.net>
Wed, 21 Nov 2012 19:51:14 +0000 (19:51 +0000)
commit16510bd12f5eef9876a5785604f848510b8629cd
treed9697c5b3d78396ecb98d251a35e856bbf24118c
parent8708335e71d757022090ae081a7483ab2731ecaa
parent867860c3c9e310ff77d42dcbaafb5a67de4312e4
Merge tag 'marvell-boards-net-for-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything

Marvell boards changes related to Ethernet, for 3.8

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