Merge tag 'marvell-boards-net-for-3.8' of github.com:MISL-EBU-System-SW/mainline...
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 20 Nov 2012 22:09:20 +0000 (23:09 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 20 Nov 2012 22:09:20 +0000 (23:09 +0100)
commit05e121af947aa59647762aaf3773b6f53f498f67
treed9697c5b3d78396ecb98d251a35e856bbf24118c
parentbb4f6ce2f3683e11e79d923eac945e49ddb6df4a
parent9f32cccc67590ccda30529bcbcea5c22d95c00a6
Merge tag 'marvell-boards-net-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge

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