diff options
author | Olof Johansson <olof@lixom.net> | 2014-02-20 00:52:24 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-02-20 00:52:39 -0800 |
commit | a671d255afb47bd2f83b94355b2848a0d46a1a92 (patch) | |
tree | deab7c0c89c8f9070a6d3e436d95dbe07d038687 /MAINTAINERS | |
parent | 4a179c1f3784ac3fad626a4a2e67a559bcba3ad3 (diff) | |
parent | cf1e8f0cd665e2a9966d2bee4e11ecc0938ff166 (diff) | |
download | talos-obmc-linux-a671d255afb47bd2f83b94355b2848a0d46a1a92.tar.gz talos-obmc-linux-a671d255afb47bd2f83b94355b2848a0d46a1a92.zip |
Merge tag 'qcom-cleanup-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/cleanup
Merge "General cleanups for MSM/QCOM for 3.15" from Kumar Gala:
Split of the multiplatform support for the Qualcomm SoCs into a mach-qcom
while we leave mach-msm as legacy support. Also, some smp and device tree
related cleanups.
* tag 'qcom-cleanup-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
ARM: qcom: Rename various msm prefixed functions to qcom
clocksource: qcom: split building of legacy vs multiplatform support
ARM: qcom: Split Qualcomm support into legacy and multiplatform
clocksource: qcom: Move clocksource code out of mach-msm
ARM: msm: kill off hotplug.c
ARM: msm: Remove pen_release usage
ARM: dts: msm: split out msm8660 and msm8960 soc into dts include
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index fb08dcececf1..9dbf7f1898c5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1167,6 +1167,14 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://www.arm.linux.org.uk/ S: Maintained +ARM/QUALCOMM SUPPORT +M: Kumar Gala <galak@codeaurora.org> +M: David Brown <davidb@codeaurora.org> +L: linux-arm-msm@vger.kernel.org +S: Maintained +F: arch/arm/mach-qcom/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git + ARM/RADISYS ENP2611 MACHINE SUPPORT M: Lennert Buytenhek <kernel@wantstofly.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |