Merge tag 'qcom-defconfig-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/defconfig
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