From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 May 2014 19:32:29 +0000 (+0200)
Subject: Merge tag 'qcom-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/galak... 
X-Git-Tag: omap-for-v3.16/fixes-against-rc1~52^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ad0bbd8696904c34a1fb266a25efe2be818c0c7;p=pandora-kernel.git

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

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

* Enabling building pinctrl and AMBA bus support
* Clean up debug UART selection

* tag 'qcom-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: qcom: Select PINCTRL by default for ARCH_QCOM
  ARM: debug: qcom: make UART address selection configuration option
  ARM: qcom: Enable ARM_AMBA option for Qualcomm SOCs.

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm/mach-qcom/Kconfig

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

8ad0bbd8696904c34a1fb266a25efe2be818c0c7
Reading git-diff-tree failed