Merge tag 'qcom-defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:08:46 +0000 (00:08 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 22:08:46 +0000 (00:08 +0200)
commit143a84c298ce7d724d9ecbd1bf5adc4b51974e71
treea29832ff205ef5256e0bb51506624904ba745e9a
parentc6a7d1c6c2da4da8f4832cec78c59d142b828cf6
parentf604759ec025e21d0c29a6d0addd53bbc60eb12e
Merge tag 'qcom-defconfig-for-3.16' of git://git./linux/kernel/git/galak/linux-qcom into next/defconfig

Merge "Qualcomm ARM Based defconfig Updates for v3.16" from Kumar Gala:

* Add a new qcom_defconfig for mach-qcom
* Update msm_defconfig for handling building the old mach-msm

* tag 'qcom-defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: config: Update msm_defconfig
  ARM: config: Add qcom_defconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>