summaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-10-01 16:37:33 +0200
committerArnd Bergmann <arnd@arndb.de>2014-10-01 16:37:33 +0200
commita41988a050c0d77f8100ccc576d413a28797fa79 (patch)
treeb628510a32641a7f8ce530382f9a60740e21cbdc /arch/ia64
parent6b74db0650b0aaca8550d283eca7dcc1dc2ba80f (diff)
parent3b6357a79b7b0a2c3b31c5c92d5dd0c51cda0391 (diff)
Merge tag 'qcom-defconfig-for-3.18' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/ia64')
0 files changed, 0 insertions, 0 deletions