Merge branch 'devel-stable' into devel

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 66a3865da88d09cb2edf169ea7af1e8253863bb9..ed6a10349b14a8a74ff5260329f4dabeb4a68e8a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -155,10 +155,9 @@ S: Maintained
 F:     drivers/net/r8169.c
 
 8250/16?50 (AND CLONE UARTS) SERIAL DRIVER
-M:     Alan Cox <alan@lxorguk.ukuu.org.uk>
 L:     linux-serial@vger.kernel.org
 W:     http://serial.sourceforge.net
-S:     Odd Fixes
+S:     Orphan
 F:     drivers/serial/8250*
 F:     include/linux/serial_8250.h
 
@@ -535,10 +534,30 @@ 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
+M:     Leo Chen <leochen@broadcom.com>
+M:     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
+M:     Leo Chen <leochen@broadcom.com>
+M:     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
-M:     Lennert Buytenhek <kernel@wantstofly.org>
+M:     Hartley Sweeten <hsweeten@visionengravers.com>
+M:     Ryan Mallon <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
 M:     Lennert Buytenhek <kernel@wantstofly.org>
@@ -686,6 +705,18 @@ ARM/MAGICIAN MACHINE SUPPORT
 M:     Philipp Zabel <philipp.zabel@gmail.com>
 S:     Maintained
 
+ARM/Marvell Loki/Kirkwood/MV78xx0/Orion SOC support
+M:     Lennert Buytenhek <buytenh@marvell.com>
+M:     Nicolas Pitre <nico@marvell.com>
+L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
+T:     git git://git.marvell.com/orion
+S:     Maintained
+F:     arch/arm/mach-loki/
+F:     arch/arm/mach-kirkwood/
+F:     arch/arm/mach-mv78xx0/
+F:     arch/arm/mach-orion5x/
+F:     arch/arm/plat-orion/
+
 ARM/MIOA701 MACHINE SUPPORT
 M:     Robert Jarzmik <robert.jarzmik@free.fr>
 L:     linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
@@ -3421,8 +3452,7 @@ S:        Supported
 F:     drivers/mfd/
 
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
-M:     Pierre Ossman <pierre@ossman.eu>
-S:     Maintained
+S:     Orphan
 F:     drivers/mmc/
 F:     include/linux/mmc/
 
@@ -4997,9 +5027,7 @@ T:        git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git
 S:     Maintained
 
 TTY LAYER
-M:     Alan Cox <alan@lxorguk.ukuu.org.uk>
-S:     Maintained
-T:     stgit http://zeniv.linux.org.uk/~alan/ttydev/
+S:     Orphan
 F:     drivers/char/tty_*
 F:     drivers/serial/serial_core.c
 F:     include/linux/serial_core.h