-
由 Arnd Bergmann 提交于
Merge tag 'sunxi-defconfig-for-3.18' of git://git.kernel.org/pub/scm/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: NArnd 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
cb88e7cd