From: Arnd Bergmann Date: Thu, 25 Sep 2014 16:12:02 +0000 (+0200) Subject: Merge tag 'sunxi-defconfig-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cb88e7cdd1547d280e1fe94502133daca2bfccc7;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 * 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 --- cb88e7cdd1547d280e1fe94502133daca2bfccc7