Merge tag 'jfs-4.9' of git://github.com/kleikamp/linux-shaggy

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 434a43d..f6c3466 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1847,6 +1847,7 @@ F:        arch/arm/mach-uniphier/
 F:     arch/arm/mm/cache-uniphier.c
 F:     arch/arm64/boot/dts/socionext/
 F:     drivers/bus/uniphier-system-bus.c
+F:     drivers/clk/uniphier/
 F:     drivers/i2c/busses/i2c-uniphier*
 F:     drivers/pinctrl/uniphier/
 F:     drivers/tty/serial/8250/8250_uniphier.c
@@ -3164,6 +3165,7 @@ COMMON CLK FRAMEWORK
 M:     Michael Turquette <mturquette@baylibre.com>
 M:     Stephen Boyd <sboyd@codeaurora.org>
 L:     linux-clk@vger.kernel.org
+Q:     http://patchwork.kernel.org/project/linux-clk/list/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
 S:     Maintained
 F:     Documentation/devicetree/bindings/clock/
@@ -4408,7 +4410,6 @@ F:        Documentation/filesystems/ecryptfs.txt
 F:     fs/ecryptfs/
 
 EDAC-CORE
-M:     Doug Thompson <dougthompson@xmission.com>
 M:     Borislav Petkov <bp@alien8.de>
 M:     Mauro Carvalho Chehab <mchehab@s-opensource.com>
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -4421,14 +4422,12 @@ F:      drivers/edac/
 F:     include/linux/edac.h
 
 EDAC-AMD64
-M:     Doug Thompson <dougthompson@xmission.com>
 M:     Borislav Petkov <bp@alien8.de>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/amd64_edac*
 
 EDAC-CALXEDA
-M:     Doug Thompson <dougthompson@xmission.com>
 M:     Robert Richter <rric@kernel.org>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
@@ -4444,17 +4443,21 @@ F:      drivers/edac/octeon_edac*
 
 EDAC-E752X
 M:     Mark Gross <mark.gross@intel.com>
-M:     Doug Thompson <dougthompson@xmission.com>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/e752x_edac.c
 
 EDAC-E7XXX
-M:     Doug Thompson <dougthompson@xmission.com>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/e7xxx_edac.c
 
+EDAC-FSL_DDR
+M:     York Sun <york.sun@nxp.com>
+L:     linux-edac@vger.kernel.org
+S:     Maintained
+F:     drivers/edac/fsl_ddr_edac.*
+
 EDAC-GHES
 M:     Mauro Carvalho Chehab <mchehab@s-opensource.com>
 M:     Mauro Carvalho Chehab <mchehab@kernel.org>
@@ -4469,13 +4472,11 @@ S:      Maintained
 F:     drivers/edac/i82443bxgx_edac.c
 
 EDAC-I3000
-M:     Jason Uhlenkott <juhlenko@akamai.com>
 L:     linux-edac@vger.kernel.org
-S:     Maintained
+S:     Orphan
 F:     drivers/edac/i3000_edac.c
 
 EDAC-I5000
-M:     Doug Thompson <dougthompson@xmission.com>
 L:     linux-edac@vger.kernel.org
 S:     Maintained
 F:     drivers/edac/i5000_edac.c
@@ -7678,6 +7679,13 @@ W:       http://www.mellanox.com
 Q:     http://patchwork.ozlabs.org/project/netdev/list/
 F:     drivers/net/ethernet/mellanox/mlxsw/
 
+MELLANOX MLXCPLD LED DRIVER
+M:     Vadim Pasternak <vadimp@mellanox.com>
+L:     linux-leds@vger.kernel.org
+S:     Supported
+F:     drivers/leds/leds-mlxcpld.c
+F:     Documentation/leds/leds-mlxcpld.txt
+
 MELLANOX PLATFORM DRIVER
 M:      Vadim Pasternak <vadimp@mellanox.com>
 L:      platform-driver-x86@vger.kernel.org
@@ -9943,6 +9951,12 @@ F:       drivers/rpmsg/
 F:     Documentation/rpmsg.txt
 F:     include/linux/rpmsg.h
 
+RENESAS CLOCK DRIVERS
+M:     Geert Uytterhoeven <geert+renesas@glider.be>
+L:     linux-renesas-soc@vger.kernel.org
+S:     Supported
+F:     drivers/clk/renesas/
+
 RENESAS ETHERNET DRIVERS
 R:     Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
 L:     netdev@vger.kernel.org
@@ -10286,9 +10300,12 @@ F:     drivers/nfc/s3fwrn5
 SAMSUNG SOC CLOCK DRIVERS
 M:     Sylwester Nawrocki <s.nawrocki@samsung.com>
 M:     Tomasz Figa <tomasz.figa@gmail.com>
+M:     Chanwoo Choi <cw00.choi@samsung.com>
 S:     Supported
 L:     linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
 F:     drivers/clk/samsung/
+F:     include/dt-bindings/clock/exynos*.h
+F:     Documentation/devicetree/bindings/clock/exynos*.txt
 
 SAMSUNG SPI DRIVERS
 M:     Kukjin Kim <kgene@kernel.org>
@@ -11147,6 +11164,7 @@ F:      Documentation/spi/
 F:     drivers/spi/
 F:     include/linux/spi/
 F:     include/uapi/linux/spi/
+F:     tools/spi/
 
 SPIDERNET NETWORK DRIVER for CELL
 M:     Ishizaki Kou <kou.ishizaki@toshiba.co.jp>
@@ -12216,7 +12234,7 @@ S:      Maintained
 F:     drivers/net/usb/lan78xx.*
 
 USB MASS STORAGE DRIVER
-M:     Matthew Dharm <mdharm-usb@one-eyed-alien.net>
+M:     Alan Stern <stern@rowland.harvard.edu>
 L:     linux-usb@vger.kernel.org
 L:     usb-storage@lists.one-eyed-alien.net
 S:     Maintained
@@ -12300,6 +12318,7 @@ F:      drivers/net/usb/rtl8150.c
 USB SERIAL SUBSYSTEM
 M:     Johan Hovold <johan@kernel.org>
 L:     linux-usb@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git
 S:     Maintained
 F:     Documentation/usb/usb-serial.txt
 F:     drivers/usb/serial/