]> git.baikalelectronics.ru Git - kernel.git/commit
Merge tag 'qcom-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/galak...
authorArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 19:32:29 +0000 (21:32 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 23 May 2014 19:56:57 +0000 (21:56 +0200)
commit11e6888ff1dedf5619f9c4feefd9748ff7a04cbd
treed1b58d1d47a40f267c3ef195831786fcceec91a9
parent5822fe65fa821ee1f050126130a876c161a6e277
parent00b4a5f261a2c9bcb1449cd9eec49eb075ae7f22
Merge tag 'qcom-soc-for-3.16' of git://git.kernel.org/pub/scm/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>
arch/arm/Kconfig.debug
arch/arm/mach-qcom/Kconfig