Merge remote-tracking branch 'backlight/for-backlight-next'

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index fdab710e39b72c6b3cb3e692736de5b3de03f4df..936a51f4e57c951cec0d0fc604d8be5a05e34f5d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6314,6 +6314,14 @@ F:       drivers/nvdimm/pmem.c
 F:     include/linux/pmem.h
 F:     arch/*/include/asm/pmem.h
 
+LIGHTNVM PLATFORM SUPPORT
+M:     Matias Bjorling <mb@lightnvm.io>
+W:     http://github/OpenChannelSSD
+S:     Maintained
+F:     drivers/lightnvm/
+F:     include/linux/lightnvm.h
+F:     include/uapi/linux/lightnvm.h
+
 LINUX FOR IBM pSERIES (RS/6000)
 M:     Paul Mackerras <paulus@au.ibm.com>
 W:     http://www.ibm.com/linux/ltc/projects/ppc
@@ -7121,7 +7129,6 @@ F:        drivers/media/i2c/mt9v032.c
 F:     include/media/mt9v032.h
 
 MULTIFUNCTION DEVICES (MFD)
-M:     Samuel Ortiz <sameo@linux.intel.com>
 M:     Lee Jones <lee.jones@linaro.org>
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git
 S:     Supported
@@ -7521,11 +7528,13 @@ F:      drivers/video/fbdev/riva/
 F:     drivers/video/fbdev/nvidia/
 
 NVM EXPRESS DRIVER
-M:     Matthew Wilcox <willy@linux.intel.com>
+M:     Keith Busch <keith.busch@intel.com>
+M:     Jens Axboe <axboe@fb.com>
 L:     linux-nvme@lists.infradead.org
-T:     git git://git.infradead.org/users/willy/linux-nvme.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
+W:     https://kernel.googlesource.com/pub/scm/linux/kernel/git/axboe/linux-block/
 S:     Supported
-F:     drivers/block/nvme*
+F:     drivers/nvme/host/
 F:     include/linux/nvme.h
 
 NVMEM FRAMEWORK
@@ -11236,6 +11245,12 @@ S:     Maintained
 F:     drivers/media/v4l2-core/videobuf2-*
 F:     include/media/videobuf2-*
 
+VIRTUAL SERIO DEVICE DRIVER
+M:     Stephen Chandler Paul <thatslyude@gmail.com>
+S:     Maintained
+F:     drivers/input/serio/userio.c
+F:     include/uapi/linux/userio.h
+
 VIRTIO CONSOLE DRIVER
 M:     Amit Shah <amit.shah@redhat.com>
 L:     virtualization@lists.linux-foundation.org
@@ -11519,6 +11534,9 @@ T:      git https://github.com/CirrusLogic/linux-drivers.git
 W:     https://github.com/CirrusLogic/linux-drivers/wiki
 S:     Supported
 F:     Documentation/hwmon/wm83??
+F:     Documentation/devicetree/bindings/extcon/extcon-arizona.txt
+F:     Documentation/devicetree/bindings/regulator/arizona-regulator.txt
+F:     Documentation/devicetree/bindings/mfd/arizona.txt
 F:     arch/arm/mach-s3c64xx/mach-crag6410*
 F:     drivers/clk/clk-wm83*.c
 F:     drivers/extcon/extcon-arizona.c