Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[platform/kernel/linux-starfive.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2c7a9b3..85365af 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1471,7 +1471,9 @@ F:        arch/arm/mach-mxs/
 F:     arch/arm/boot/dts/imx*
 F:     arch/arm/configs/imx*_defconfig
 F:     drivers/clk/imx/
+F:     drivers/firmware/imx/
 F:     drivers/soc/imx/
+F:     include/linux/firmware/imx/
 F:     include/soc/imx/
 
 ARM/FREESCALE VYBRID ARM ARCHITECTURE
@@ -5401,6 +5403,14 @@ L:       linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/ti_edac.c
 
+EDAC-QCOM
+M:     Channagoud Kadabi <ckadabi@codeaurora.org>
+M:     Venkata Narendra Kumar Gutta <vnkgutta@codeaurora.org>
+L:     linux-arm-msm@vger.kernel.org
+L:     linux-edac@vger.kernel.org
+S:     Maintained
+F:     drivers/edac/qcom_edac.c
+
 EDIROL UA-101/UA-1000 DRIVER
 M:     Clemens Ladisch <clemens@ladisch.de>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)