Merge tag 'sunxi-defconfig-for-3.11' of git://github.com/mripard/linux into next/soc
From Maxime Ripard:
Allwinner defconfig changes for 3.11
* tag 'sunxi-defconfig-for-3.11' of git://github.com/mripard/linux:
ARM: multi_v7: Enable Allwinner EMAC in multi_v7_defconfig
Signed-off-by: Arnd Bergmann <arnd@arndb.de>