From: Olof Johansson <olof@lixom.net>
Date: Tue, 27 Jan 2015 04:23:02 +0000 (-0800)
Subject: Merge tag 'sunxi-defconfig-for-3.20' of https://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: fixes-v4.0-rc1~84^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d8cedf9b2477ca0b80eea933ca8101ae7064c59;p=pandora-kernel.git

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>
---

1d8cedf9b2477ca0b80eea933ca8101ae7064c59
Reading git-diff-tree failed