Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9d1601e..7b91c6e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -603,11 +603,32 @@ L:        linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:     http://maxim.org.za/at91_26.html
 S:     Maintained
 
+ARM/BCMRING ARM ARCHITECTURE
+P:     Leo Chen <leochen@broadcom.com>
+P:     Scott Branden <sbranden@broadcom.com>
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+S:     Maintained
+F:     arch/arm/mach-bcmring
+
+ARM/BCMRING MTD NAND DRIVER
+P:     Leo Chen <leochen@broadcom.com>
+P:     Scott Branden <sbranden@broadcom.com>
+L:     linux-mtd@lists.infradead.org
+S:     Maintained
+F:     drivers/mtd/nand/bcm_umi_nand.c
+F:     drivers/mtd/nand/bcm_umi_bch.c
+F:     drivers/mtd/nand/bcm_umi_hamming.c
+F:     drivers/mtd/nand/nand_bcm_umi.h
+
 ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
-P:     Lennert Buytenhek
-M:     kernel@wantstofly.org
+P:     Hartley Sweeten
+M:     hsweeten@visionengravers.com
+P:     Ryan Mallon
+M:     ryan@bluewatersys.com
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 S:     Maintained
+F:     arch/arm/mach-ep93xx/
+F:     arch/arm/mach-ep93xx/include/mach/
 
 ARM/CIRRUS LOGIC EDB9315A MACHINE SUPPORT
 P:     Lennert Buytenhek