diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 21:32:29 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 21:56:57 +0200 |
| commit | 8ad0bbd8696904c34a1fb266a25efe2be818c0c7 (patch) | |
| tree | d1b58d1d47a40f267c3ef195831786fcceec91a9 /arch/arm/mach-sunxi/common.h | |
| parent | 37f5f4e17399ffb572af3834b8045c5391a5bf0b (diff) | |
| parent | 87cfb00d666cca3abf36f755279cde1b27b9c377 (diff) | |
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>
Diffstat (limited to 'arch/arm/mach-sunxi/common.h')
0 files changed, 0 insertions, 0 deletions