Merge tag 'sunxi-defconfig-for-3.15' of https://github.com/mripard/linux into next/boards

Merge "Allwinner defconfig additions for 3.15" from Maxime Ripard:

Enables SPI and SID drivers in sunxi defconfig

* tag 'sunxi-defconfig-for-3.15' of https://github.com/mripard/linux

:
  ARM: sunxi: Enable A31 SPI and SID in the defconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>