Merge tag 'sunxi-defconfig-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 16:12:02 +0000 (18:12 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 25 Sep 2014 16:12:02 +0000 (18:12 +0200)
commitcb88e7cdd1547d280e1fe94502133daca2bfccc7
tree681e1fa5453c0968adfeec2e3915d629090652b7
parent413cb0036c24b91ba057fbb8b125b4bbf6afa55a
parent9524fa523e10c75750962c4079e6d002d7487280
Merge tag 'sunxi-defconfig-for-3.18' of git://git./linux/kernel/git/mripard/linux into next/defconfig

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
arch/arm/configs/multi_v7_defconfig
arch/arm/configs/sunxi_defconfig