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

[linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2243d9142c06301216f1318cfeaede2c905a0f80..e23ff1cbd12b5f53fe19ce4398b1940d330d423a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2026,10 +2026,10 @@ S:      Maintained
 F:     drivers/net/hamradio/baycom*
 
 BCACHE (BLOCK LAYER CACHE)
-M:     Kent Overstreet <kmo@daterainc.com>
+M:     Kent Overstreet <kent.overstreet@gmail.com>
 L:     [email protected]
 W:     http://bcache.evilpiepirate.org
-S:     Maintained:
+S:     Maintained
 F:     drivers/md/bcache/
 
 BDISP ST MEDIA DRIVER
@@ -2280,7 +2280,7 @@ S:        Maintained
 F:     arch/mips/bmips/*
 F:     arch/mips/include/asm/mach-bmips/*
 F:     arch/mips/kernel/*bmips*
-F:     arch/mips/boot/dts/bcm*.dts*
+F:     arch/mips/boot/dts/brcm/bcm*.dts*
 F:     drivers/irqchip/irq-bcm7*
 F:     drivers/irqchip/irq-brcmstb*
 
@@ -2339,7 +2339,7 @@ M:        Ray Jui <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     drivers/gpio/gpio-bcm-kona.c
-F:     Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
+F:     Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
 
 BROADCOM NVRAM DRIVER
 M:     Rafał Miłecki <[email protected]>
@@ -2763,7 +2763,7 @@ F:        Documentation/devicetree/bindings/media/coda.txt
 F:     drivers/media/platform/coda/
 
 COMMON CLK FRAMEWORK
-M:     Mike Turquette <[email protected]>
+M:     Michael Turquette <[email protected]>
 M:     Stephen Boyd <[email protected]>
 L:     [email protected]
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git
@@ -3216,6 +3216,11 @@ L:       [email protected]
 S:     Maintained
 F:     drivers/platform/x86/dell-laptop.c
 
+DELL LAPTOP RBTN DRIVER
+M:     Pali Rohár <[email protected]>
+S:     Maintained
+F:     drivers/platform/x86/dell-rbtn.*
+
 DELL LAPTOP FREEFALL DRIVER
 M:     Pali Rohár <[email protected]>
 S:     Maintained
@@ -4425,9 +4430,11 @@ FUSE: FILESYSTEM IN USERSPACE
 M:     Miklos Szeredi <[email protected]>
 L:     [email protected]
 W:     http://fuse.sourceforge.net/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git
 S:     Maintained
 F:     fs/fuse/
 F:     include/uapi/linux/fuse.h
+F:     Documentation/filesystems/fuse.txt
 
 FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
 M:     Rik Faith <[email protected]>
@@ -6786,9 +6793,8 @@ S:        Maintained
 F:     drivers/platform/x86/msi-laptop.c
 
 MSI WMI SUPPORT
-M:     Anisse Astier <[email protected]>
 L:     [email protected]
-S:     Supported
+S:     Orphan
 F:     drivers/platform/x86/msi-wmi.c
 
 MSI001 MEDIA DRIVER
@@ -7018,7 +7024,6 @@ L:        [email protected]
 T:     git git://git.pengutronix.de/git/mpa/linux-nbd.git
 F:     Documentation/blockdev/nbd.txt
 F:     drivers/block/nbd.c
-F:     include/linux/nbd.h
 F:     include/uapi/linux/nbd.h
 
 NETWORK DROP MONITOR
@@ -7359,7 +7364,6 @@ M:        Ohad Ben-Cohen <[email protected]>
 L:     [email protected]
 S:     Maintained
 F:     drivers/hwspinlock/omap_hwspinlock.c
-F:     arch/arm/mach-omap2/hwspinlock.c
 
 OMAP MMC SUPPORT
 M:     Jarkko Lavinen <[email protected]>
@@ -9591,7 +9595,6 @@ F:        include/uapi/linux/spi/
 
 SPIDERNET NETWORK DRIVER for CELL
 M:     Ishizaki Kou <[email protected]>
-M:     Jens Osterkamp <[email protected]>
 L:     [email protected]
 S:     Supported
 F:     Documentation/networking/spider_net.txt
@@ -9830,6 +9833,13 @@ F:       arch/arc/
 F:     Documentation/devicetree/bindings/arc/
 F:     drivers/tty/serial/arc_uart.c
 
+SYNOPSYS ARC SDP platform support
+M:     Alexey Brodkin <[email protected]>
+S:     Supported
+F:     arch/arc/plat-axs10x
+F:     arch/arc/boot/dts/ax*
+F:     Documentation/devicetree/bindings/arc/axs10*
+
 SYSTEM CONFIGURATION (SYSCON)
 M:     Lee Jones <[email protected]>
 M:     Arnd Bergmann <[email protected]>
@@ -11345,6 +11355,13 @@ L:     [email protected] (subscribers-only)
 S:     Maintained
 F:     drivers/net/wireless/zd1211rw/
 
+ZPOOL COMPRESSED PAGE STORAGE API
+M:     Dan Streetman <[email protected]>
+L:     [email protected]
+S:     Maintained
+F:     mm/zpool.c
+F:     include/linux/zpool.h
+
 ZR36067 VIDEO FOR LINUX DRIVER
 L:     [email protected]
 L:     [email protected]