Merge tag 'sunxi-defconfig-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Tue, 27 Jan 2015 04:23:02 +0000 (20:23 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 27 Jan 2015 04:23:02 +0000 (20:23 -0800)
commit1d8cedf9b2477ca0b80eea933ca8101ae7064c59
tree0f59bf80a2509d283e1e120cab1859b1ccda775f
parent1739be8f3f0810a853d095720dd67447858131b4
parentfef3f0dde681a32f148b765ee8e1465fba9b3cd4
Merge tag 'sunxi-defconfig-for-3.20' of https://git./linux/kernel/git/mripard/linux into next/defconfig

Merge "Allwinner defconfig changes for 3.20" from Maxime Ripard:

Defconfig changes for both sunxi and multi_v7 defconfig in order to add the
cpufreq-related drivers and the PMIC drivers.

* tag 'sunxi-defconfig-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi: Add AXP20x support multi_v7_defconfig
  ARM: sunxi: Add AXP20x support in defconfig
  ARM: multi_v7_defconfig: Enable TOUCHSCREEN_SUN4I, CPU_THERMAL
  ARM: sunxi_defconfig: Enable TOUCHSCREEN_SUN4I, CPUFREQ_DT, CPU_THERMAL

Signed-off-by: Olof Johansson <olof@lixom.net>
arch/arm/configs/multi_v7_defconfig