Merge tag 'marvell-net-xor-defconfig-for-3.8' of...

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