From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Tue, 20 Nov 2012 22:35:16 +0000 (+0100)
Subject: Merge tag 'marvell-boards-net-for-3.8' of github.com:MISL-EBU-System-SW/mainline... 
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~12^2~1^2~1^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=089c38e7245e052951dce7a6916b12631a26561d;p=pandora-kernel.git

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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

089c38e7245e052951dce7a6916b12631a26561d
Reading git-diff-tree failed