]> git.kernelconcepts.de Git - karo-tx-linux.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)
commitedd47fbb4947f51261ee6c0e5c56f50eba9282a1
treed9697c5b3d78396ecb98d251a35e856bbf24118c
parent4135c7d4a74c6b796277e6c090c70e960254014e
parent9f32cccc67590ccda30529bcbcea5c22d95c00a6
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