Merge tag 'omap-for-v3.20/dm816x-data' of git://git.kernel.org/pub/scm/linux/kernel...

[firefly-linux-kernel-4.4.55.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3589d67437f867e121bc36b0ff2b92e758499c04..a087a6ddce362fbad5231fcb559f3774cdae0979 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -877,6 +877,7 @@ F:  arch/arm/boot/dts/at91*.dts
 F:     arch/arm/boot/dts/at91*.dtsi
 F:     arch/arm/boot/dts/sama*.dts
 F:     arch/arm/boot/dts/sama*.dtsi
+F:     arch/arm/include/debug/at91.S
 
 ARM/ATMEL AT91 Clock Support
 M:     Boris Brezillon <boris.brezillon@free-electrons.com>
@@ -1290,10 +1291,13 @@ S:      Maintained
 
 ARM/QUALCOMM SUPPORT
 M:     Kumar Gala <galak@codeaurora.org>
+M:     Andy Gross <agross@codeaurora.org>
 M:     David Brown <davidb@codeaurora.org>
 L:     linux-arm-msm@vger.kernel.org
+L:     linux-soc@vger.kernel.org
 S:     Maintained
 F:     arch/arm/mach-qcom/
+F:     drivers/soc/qcom/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
 
 ARM/RADISYS ENP2611 MACHINE SUPPORT