Merge tag 'marvell-net-xor-defconfig-for-3.8' of github.com:MISL-EBU-System-SW/mainli...
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 20 Nov 2012 22:42:09 +0000 (23:42 +0100)
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tue, 20 Nov 2012 22:42:09 +0000 (23:42 +0100)
Marvell mvebu defconfig updates for 3.8

Conflicts:
arch/arm/configs/mvebu_defconfig

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

Trivial merge