]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit7bc920c5d9ae9bedab73f7b9b548e9ba698471b8
treed9697c5b3d78396ecb98d251a35e856bbf24118c
parent23dad11da07186dfb09e4a5565681b5ef4f37ff7
parent867860c3c9e310ff77d42dcbaafb5a67de4312e4
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