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

[linux-2.6-microblaze.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 485f793..b5b00eb 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1219,6 +1219,8 @@ L:        linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 W:     http://www.linux4sam.org
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
 S:     Supported
+N:     at91
+N:     atmel
 F:     arch/arm/mach-at91/
 F:     include/soc/at91/
 F:     arch/arm/boot/dts/at91*.dts
@@ -1227,6 +1229,9 @@ F:        arch/arm/boot/dts/sama*.dts
 F:     arch/arm/boot/dts/sama*.dtsi
 F:     arch/arm/include/debug/at91.S
 F:     drivers/memory/atmel*
+F:     drivers/watchdog/sama5d4_wdt.c
+X:     drivers/input/touchscreen/atmel_mxt_ts.c
+X:     drivers/net/wireless/atmel/
 
 ARM/CALXEDA HIGHBANK ARCHITECTURE
 M:     Rob Herring <robh@kernel.org>
@@ -2141,7 +2146,6 @@ F:        drivers/gpio/gpio-zx.c
 F:     drivers/i2c/busses/i2c-zx2967.c
 F:     drivers/mmc/host/dw_mmc-zx.*
 F:     drivers/pinctrl/zte/
-F:     drivers/reset/reset-zx2967.c
 F:     drivers/soc/zte/
 F:     drivers/thermal/zx2967_thermal.c
 F:     drivers/watchdog/zx2967_wdt.c
@@ -2990,6 +2994,14 @@ L:       bcm-kernel-feedback-list@broadcom.com
 S:     Maintained
 F:     drivers/mtd/nand/brcmnand/
 
+BROADCOM STB DPFE DRIVER
+M:     Markus Mayer <mmayer@broadcom.com>
+M:     bcm-kernel-feedback-list@broadcom.com
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/memory-controllers/brcm,dpfe-cpu.txt
+F:     drivers/memory/brcmstb_dpfe.c
+
 BROADCOM SYSTEMPORT ETHERNET DRIVER
 M:     Florian Fainelli <f.fainelli@gmail.com>
 L:     netdev@vger.kernel.org
@@ -13004,6 +13016,12 @@ F:     arch/arc/plat-axs10x
 F:     arch/arc/boot/dts/ax*
 F:     Documentation/devicetree/bindings/arc/axs10*
 
+SYNOPSYS AXS10x RESET CONTROLLER DRIVER
+M:     Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>
+S:     Supported
+F:     drivers/reset/reset-axs10x.c
+F:     Documentation/devicetree/bindings/reset/snps,axs10x-reset.txt
+
 SYNOPSYS DESIGNWARE APB GPIO DRIVER
 M:     Hoan Tran <hotran@apm.com>
 L:     linux-gpio@vger.kernel.org