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

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2f0e8d927185125f416669157afe9aa5ad525e2f..4ad9d6a4c3ac8cda713c484b48e635c2e11ad884 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -875,6 +875,12 @@ S: Supported
 F:     drivers/android/
 F:     drivers/staging/android/
 
+ANDROID GOLDFISH PIC DRIVER
+M:     Miodrag Dinic <miodrag.dinic@mips.com>
+S:     Supported
+F:     Documentation/devicetree/bindings/interrupt-controller/google,goldfish-pic.txt
+F:     drivers/irqchip/irq-goldfish-pic.c
+
 ANDROID GOLDFISH RTC DRIVER
 M:     Miodrag Dinic <miodrag.dinic@mips.com>
 S:     Supported
@@ -2392,13 +2398,6 @@ F:       Documentation/devicetree/bindings/input/atmel,maxtouch.txt
 F:     drivers/input/touchscreen/atmel_mxt_ts.c
 F:     include/linux/platform_data/atmel_mxt_ts.h
 
-ATMEL NAND DRIVER
-M:     Wenyou Yang <wenyou.yang@atmel.com>
-M:     Josh Wu <rainyfeeling@outlook.com>
-L:     linux-mtd@lists.infradead.org
-S:     Supported
-F:     drivers/mtd/nand/atmel/*
-
 ATMEL SAMA5D2 ADC DRIVER
 M:     Ludovic Desroches <ludovic.desroches@microchip.com>
 L:     linux-iio@vger.kernel.org
@@ -5148,6 +5147,12 @@ L:       linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/skx_edac.c
 
+EDAC-TI
+M:     Tero Kristo <t-kristo@ti.com>
+L:     linux-edac@vger.kernel.org
+S:     Maintained
+F:     drivers/edac/ti_edac.c
+
 EDIROL UA-101/UA-1000 DRIVER
 M:     Clemens Ladisch <clemens@ladisch.de>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
@@ -8406,6 +8411,13 @@ L:       linux-wireless@vger.kernel.org
 S:     Odd Fixes
 F:     drivers/net/wireless/marvell/mwl8k.c
 
+MARVELL NAND CONTROLLER DRIVER
+M:     Miquel Raynal <miquel.raynal@free-electrons.com>
+L:     linux-mtd@lists.infradead.org
+S:     Maintained
+F:     drivers/mtd/nand/marvell_nand.c
+F:     Documentation/devicetree/bindings/mtd/marvell-nand.txt
+
 MARVELL SOC MMC/SD/SDIO CONTROLLER DRIVER
 M:     Nicolas Pitre <nico@fluxnic.net>
 S:     Odd Fixes
@@ -8953,7 +8965,7 @@ L:        linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
 Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
 T:     git git://git.infradead.org/linux-mtd.git master
-T:     git git://git.infradead.org/l2-mtd.git master
+T:     git git://git.infradead.org/linux-mtd.git mtd/next
 S:     Maintained
 F:     Documentation/devicetree/bindings/mtd/
 F:     drivers/mtd/
@@ -9042,6 +9054,14 @@ F:       drivers/media/platform/atmel/atmel-isc.c
 F:     drivers/media/platform/atmel/atmel-isc-regs.h
 F:     devicetree/bindings/media/atmel-isc.txt
 
+MICROCHIP / ATMEL NAND DRIVER
+M:     Wenyou Yang <wenyou.yang@microchip.com>
+M:     Josh Wu <rainyfeeling@outlook.com>
+L:     linux-mtd@lists.infradead.org
+S:     Supported
+F:     drivers/mtd/nand/atmel/*
+F:     Documentation/devicetree/bindings/mtd/atmel-nand.txt
+
 MICROCHIP KSZ SERIES ETHERNET SWITCH DRIVER
 M:     Woojung Huh <Woojung.Huh@microchip.com>
 M:     Microchip Linux Driver Support <UNGLinuxDriver@microchip.com>
@@ -9342,7 +9362,7 @@ L:        linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
 Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
 T:     git git://git.infradead.org/linux-mtd.git nand/fixes
-T:     git git://git.infradead.org/l2-mtd.git nand/next
+T:     git git://git.infradead.org/linux-mtd.git nand/next
 S:     Maintained
 F:     drivers/mtd/nand/
 F:     include/linux/mtd/*nand*.h
@@ -9743,6 +9763,15 @@ S:       Supported
 F:     Documentation/filesystems/ntfs.txt
 F:     fs/ntfs/
 
+NUBUS SUBSYSTEM
+M:     Finn Thain <fthain@telegraphics.com.au>
+L:     linux-m68k@lists.linux-m68k.org
+S:     Maintained
+F:     arch/*/include/asm/nubus.h
+F:     drivers/nubus/
+F:     include/linux/nubus.h
+F:     include/uapi/linux/nubus.h
+
 NVIDIA (rivafb and nvidiafb) FRAMEBUFFER DRIVER
 M:     Antonino Daplas <adaplas@gmail.com>
 L:     linux-fbdev@vger.kernel.org
@@ -12787,7 +12816,7 @@ L:      linux-mtd@lists.infradead.org
 W:     http://www.linux-mtd.infradead.org/
 Q:     http://patchwork.ozlabs.org/project/linux-mtd/list/
 T:     git git://git.infradead.org/linux-mtd.git spi-nor/fixes
-T:     git git://git.infradead.org/l2-mtd.git spi-nor/next
+T:     git git://git.infradead.org/linux-mtd.git spi-nor/next
 S:     Maintained
 F:     drivers/mtd/spi-nor/
 F:     include/linux/mtd/spi-nor.h
@@ -14662,6 +14691,7 @@ W:      http://www.slimlogic.co.uk/?p=48
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
 S:     Supported
 F:     Documentation/devicetree/bindings/regulator/
+F:     Documentation/power/regulator/
 F:     drivers/regulator/
 F:     include/dt-bindings/regulator/
 F:     include/linux/regulator/