From: Jason Cooper <jason@lakedaemon.net>
Date: Wed, 21 Nov 2012 20:00:36 +0000 (+0000)
Subject: Merge tag 'marvell-net-xor-defconfig-for-3.8' of git://github.com/MISL-EBU-System... 
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~12^2~1^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9580e3e3fb44a5b7a1bfefccf4f03481cdbd3c5a;p=pandora-kernel.git

Merge tag 'marvell-net-xor-defconfig-for-3.8' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything

Marvell mvebu defconfig updates for 3.8

Conflicts:
	arch/arm/configs/mvebu_defconfig
---

9580e3e3fb44a5b7a1bfefccf4f03481cdbd3c5a
Reading git-diff-tree failed