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

Merge tag 'marvell-net-xor-defconfig-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge

Marvell mvebu defconfig updates for 3.8

Conflicts:
	arch/arm/configs/mvebu_defconfig

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---

74f980beaa660614c707675ce6a11e70db3d49b6
Reading git-diff-tree failed