linux-phytec-fsl

Merge tag 'qcom-defconfig-for-3.16' of git://git.kernel.org/pub/scm/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>