Merge tag 'sunxi-defconfig-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel...

Merge tag 'sunxi-defconfig-for-4.12' of https://git./linux/kernel/git/sunxi/linux into next/defconfig

Allwinner defconfig changes for 4.12

Some patches to enable new modules in the defconfig.

* tag 'sunxi-defconfig-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: multi_v7_defconfig: Switch AXP20x driver from module to built-in
  ARM: multi_v7_defconfig: Enable AC100 RTC driver
  ARM: multi_v7_defconfig: Switch sunxi RSB driver from module to built-in
  ARM: sunxi_defconfig: Enable AC100 RTC driver

Signed-off-by: Olof Johansson <olof@lixom.net>