Merge remote-tracking branch 'iommu/next'

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index baf1f077b25a25ce022c4558039a71172ca5abe3..71c61586a34c5ed2e9edf70a4b6623d480b48066 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -6317,6 +6317,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
@@ -7124,7 +7132,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
@@ -7478,10 +7485,10 @@ NOKIA N900 POWER SUPPLY DRIVERS
 M:     Pali Rohár <pali.rohar@gmail.com>
 S:     Maintained
 F:     include/linux/power/bq2415x_charger.h
-F:     include/linux/power/bq27x00_battery.h
+F:     include/linux/power/bq27xxx_battery.h
 F:     include/linux/power/isp1704_charger.h
 F:     drivers/power/bq2415x_charger.c
-F:     drivers/power/bq27x00_battery.c
+F:     drivers/power/bq27xxx_battery.c
 F:     drivers/power/isp1704_charger.c
 F:     drivers/power/rx51_battery.c
 
@@ -7524,11 +7531,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
@@ -9064,6 +9073,13 @@ F:       drivers/s390/net/*iucv*
 F:     include/net/iucv/
 F:     net/iucv/
 
+S390 IOMMU (PCI)
+M:     Gerald Schaefer <gerald.schaefer@de.ibm.com>
+L:     linux-s390@vger.kernel.org
+W:     http://www.ibm.com/developerworks/linux/linux390/
+S:     Supported
+F:     drivers/iommu/s390-iommu.c
+
 S3C24XX SD/MMC Driver
 M:     Ben Dooks <ben-linux@fluff.org>
 L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@ -10726,6 +10742,7 @@ F:      drivers/media/pci/tw68/
 TPM DEVICE DRIVER
 M:     Peter Huewe <peterhuewe@gmx.de>
 M:     Marcel Selhorst <tpmdd@selhorst.net>
+M:     Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
 R:     Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
 W:     http://tpmdd.sourceforge.net
 L:     tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
@@ -11535,6 +11552,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