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)
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


Trivial merge