diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 12:10:37 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 12:10:37 -0800 |
| commit | 47ec7e0b7567f10da2975e05fa446be204dc2fcb (patch) | |
| tree | 68afe60332674b4e737a07e03ebdc5b614454162 /MAINTAINERS | |
| parent | 8483ff079d99e87c5da20767c0b894221019386f (diff) | |
| parent | bbeaa59598cae12626c9c42e91821e3abd5b87f0 (diff) | |
| download | talos-obmc-linux-47ec7e0b7567f10da2975e05fa446be204dc2fcb.tar.gz talos-obmc-linux-47ec7e0b7567f10da2975e05fa446be204dc2fcb.zip | |
Merge tag 'qcom-soc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux into next/drivers
Qualcomm ARM Based SoC Updates for 4.5
* Add WCNSS_CTRL client
* Various Kconfig changes to fix build issues
* Update SoC Qualcomm MAINTAINERS entry
* Add SMP2P, SMSM, and SMEM state machine drivers
* Add SMD-RPM support for existing platforms
* tag 'qcom-soc-for-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
MAINTAINERS: Change QCOM entries
soc: qcom: smd-rpm: Add existing platform support
soc: qcom: Introduce WCNSS_CTRL SMD client
ARM: qcom: select ARM_CPU_SUSPEND for power management
MAINTAINERS: Add rules for Qualcomm dts files
soc: qcom: enable smsm/smp2p modular build
serial: msm_serial: Make config tristate
soc: qcom: smp2p: Qualcomm Shared Memory Point to Point
soc: qcom: smsm: Add driver for Qualcomm SMSM
soc: qcom: Introduce common SMEM state machine code
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 668fc96ed421..3cd0e9adc8f8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1401,11 +1401,13 @@ S: Maintained ARM/QUALCOMM SUPPORT M: Kumar Gala <galak@codeaurora.org> -M: Andy Gross <agross@codeaurora.org> -M: David Brown <davidb@codeaurora.org> +M: Andy Gross <andy.gross@linaro.org> +M: David Brown <david.brown@linaro.org> L: linux-arm-msm@vger.kernel.org L: linux-soc@vger.kernel.org S: Maintained +F: arch/arm/boot/dts/qcom-*.dts +F: arch/arm/boot/dts/qcom-*.dtsi F: arch/arm/mach-qcom/ F: drivers/soc/qcom/ F: drivers/tty/serial/msm_serial.h @@ -1413,7 +1415,7 @@ F: drivers/tty/serial/msm_serial.c F: drivers/*/pm8???-* F: drivers/mfd/ssbi.c F: drivers/firmware/qcom_scm.c -T: git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git ARM/RADISYS ENP2611 MACHINE SUPPORT M: Lennert Buytenhek <kernel@wantstofly.org> |
