From: Jason Cooper Date: Wed, 21 Nov 2012 19:51:14 +0000 (+0000) Subject: Merge tag 'marvell-boards-net-for-3.8' of git://github.com/MISL-EBU-System-SW/mainlin... X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~12^2~1^2~10 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edd47fbb4947f51261ee6c0e5c56f50eba9282a1;p=pandora-kernel.git Merge tag 'marvell-boards-net-for-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything 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 --- edd47fbb4947f51261ee6c0e5c56f50eba9282a1 Reading git-diff-tree failed