Merge tag 'marvell-net-xor-defconfig-for-3.8' of git://github.com/MISL-EBU-System...
authorJason Cooper <jason@lakedaemon.net>
Wed, 21 Nov 2012 20:00:36 +0000 (20:00 +0000)
committerJason Cooper <jason@lakedaemon.net>
Wed, 21 Nov 2012 20:00:36 +0000 (20:00 +0000)
Marvell mvebu defconfig updates for 3.8

Conflicts:
arch/arm/configs/mvebu_defconfig


Trivial merge