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

Merge tag 'qcom-defconfig-for-3.18' of git://git./linux/kernel/git/galak/linux-qcom into next/defconfig

Pull "Qualcomm ARM Based defconfig Updates for v3.18" from Kumar Gala:

* General defconfig update to match upstream changes
* Enable IPQ806x & APQ8084 clk support
* Enable pinctrl on MSM8960 & APQ8084
* Enable CPU_IDLE to get basic wfi support
* Enable SPI NOR and MTD M25P80 support (used on AP148 board)
* Enable SATA PHY support on IPQ806x and APQ8064
* Enable Fixed regulator and ARM MMCI support (mmc support on APQ8064)

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'qcom-defconfig-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: qcom: Update defconfig
  ARM: qcom: Update defconfig