Merge tag 'qcom-defconfig-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git...

Merge "Qualcomm ARM Based defconfig Updates for v4.2" from Kumar Gala:

* Enable cpuidle for QCOM SoCs in qcom & multi_v7_defconfig

* tag 'qcom-defconfig-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: config: multi_v7: Update to enable cpuidle for QCOM SoCs
  ARM: config: Update qcom_defconfig to enable cpuidle

diff --cc arch/arm/configs/multi_v7_defconfig
index 3c0e23adc5eb49893538ab05639597fce096dc71,d11e4050334aa1298880e8b3d1ebde1e4d7bb65b..ff2126dc7edad51319c5bf77cd286ab95bf8e2e4
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -120,10 -112,9 +120,11 @@@ CONFIG_CPU_FREQ=
  CONFIG_CPU_FREQ_STAT_DETAILS=y
  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
  CONFIG_CPU_IDLE=y
+ CONFIG_ARM_CPUIDLE=y
  CONFIG_NEON=y
 +CONFIG_KERNEL_MODE_NEON=y
  CONFIG_ARM_ZYNQ_CPUIDLE=y
 +CONFIG_ARM_EXYNOS_CPUIDLE=y
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
@@@ -590,13 -535,9 +591,14 @@@ CONFIG_SERIO_NVEC_PS2=
  CONFIG_NVEC_POWER=y
  CONFIG_NVEC_PAZ00=y
  CONFIG_QCOM_GSBI=y
+ CONFIG_QCOM_PM=y
  CONFIG_COMMON_CLK_QCOM=y
 +CONFIG_CHROME_PLATFORMS=y
 +CONFIG_CROS_EC_CHARDEV=m
  CONFIG_COMMON_CLK_MAX77686=y
 +CONFIG_COMMON_CLK_MAX77802=m
 +CONFIG_COMMON_CLK_S2MPS11=m
 +CONFIG_COMMON_CLK_QCOM=y
  CONFIG_APQ_MMCC_8084=y
  CONFIG_MSM_GCC_8660=y
  CONFIG_MSM_MMCC_8960=y