From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 May 2014 22:08:46 +0000 (+0200)
Subject: Merge tag 'qcom-defconfig-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~176^2~3465^2~45^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=143a84c298ce7d724d9ecbd1bf5adc4b51974e71;p=firefly-linux-kernel-4.4.55.git

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>
---

143a84c298ce7d724d9ecbd1bf5adc4b51974e71