Skip to content
Commit 089c38e7 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

Merge tag 'marvell-boards-net-for-3.8' of...


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

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parents e3fad9a4 9f32cccc
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment