Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 99113b9fcdd289ca594c5960c616851755c7c3ed..5a0d1d4a905d8912b7337b9a3fb06fcdae4883f9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1540,6 +1540,7 @@ F:        arch/arm/mach-imx/
 F:     arch/arm/mach-mxs/
 F:     arch/arm/boot/dts/imx*
 F:     arch/arm/configs/imx*_defconfig
+F:     arch/arm64/boot/dts/freescale/imx*
 F:     drivers/clk/imx/
 F:     drivers/firmware/imx/
 F:     drivers/soc/imx/
@@ -1967,6 +1968,20 @@ M:       Lennert Buytenhek <kernel@wantstofly.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:     Maintained
 
+ARM/RDA MICRO ARCHITECTURE
+M:     Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L:     linux-unisoc@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     arch/arm/boot/dts/rda8810pl-*
+F:     drivers/clocksource/timer-rda.c
+F:     drivers/irqchip/irq-rda-intc.c
+F:     drivers/tty/serial/rda-uart.c
+F:     Documentation/devicetree/bindings/arm/rda.txt
+F:     Documentation/devicetree/bindings/interrupt-controller/rda,8810pl-intc.txt
+F:     Documentation/devicetree/bindings/serial/rda,8810pl-uart.txt
+F:     Documentation/devicetree/bindings/timer/rda,8810pl-timer.txt
+
 ARM/REALTEK ARCHITECTURE
 M:     Andreas Färber <afaerber@suse.de>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -10001,8 +10016,9 @@ F:      drivers/dma/at_xdmac.c
 
 MICROSEMI MIPS SOCS
 M:     Alexandre Belloni <alexandre.belloni@bootlin.com>
+M:     Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
 L:     linux-mips@vger.kernel.org
-S:     Maintained
+S:     Supported
 F:     arch/mips/generic/board-ocelot.c
 F:     arch/mips/configs/generic/board-ocelot.config
 F:     arch/mips/boot/dts/mscc/