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)
commit9580e3e3fb44a5b7a1bfefccf4f03481cdbd3c5a
tree3fe6ef056f167c4502e2f6b7d193a63dc1a8c4f2
parent98d8df630d4a508f7d5f7d3bb4d78ca436ef1c8c
parent8dc40c19efad15f5bdb77b8d1ccf902902c00c58
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
arch/arm/configs/mvebu_defconfig