Merge remote-tracking branch 'tip/auto-latest'

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9b6497c298bb896d60e0ba08bf8a82a186678974..394ad910d294da5680762dd86575baa25a43c90e 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3549,13 +3549,15 @@ M:      Jonathan Corbet <corbet@lwn.net>
 L:     linux-doc@vger.kernel.org
 S:     Maintained
 F:     Documentation/
+F:     scripts/docproc.c
+F:     scripts/kernel-doc*
 X:     Documentation/ABI/
 X:     Documentation/devicetree/
 X:     Documentation/acpi
 X:     Documentation/power
 X:     Documentation/spi
 X:     Documentation/DocBook/media
-T:     git git://git.lwn.net/linux-2.6.git docs-next
+T:     git git://git.lwn.net/linux.git docs-next
 
 DOUBLETALK DRIVER
 M:     "James R. Van Zandt" <jrv@vanzandt.mv.com>
@@ -9073,6 +9075,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)
@@ -10735,6 +10744,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)