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

Pull "Allwinner defconfig additions for 3.18" from Maxime Ripard

Nothing major, just a few drivers additions and misc options

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'sunxi-defconfig-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi_defconfig: add NLS_CODEPAGE_437 and NLS_ISO8859_1
  ARM: sunxi: Add A31 RTC driver to multi_v7_defconfig
  ARM: sunxi: Add A31 RTC driver to sunxi_defconfig

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge

diff --cc arch/arm/configs/sunxi_defconfig
Simple merge