Merge tag 'pci-v3.16-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaa...

[cascardo/linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 8ccf31c..b82ebe7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4204,9 +4204,11 @@ S:       Maintained
 F:     fs/hpfs/
 
 HSI SUBSYSTEM
-M:     Sebastian Reichel <sre@debian.org>
+M:     Sebastian Reichel <sre@kernel.org>
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git
 S:     Maintained
 F:     Documentation/ABI/testing/sysfs-bus-hsi
+F:     Documentation/hsi.txt
 F:     drivers/hsi/
 F:     include/linux/hsi/
 F:     include/uapi/linux/hsi/
@@ -6418,6 +6420,7 @@ F:        drivers/usb/*/*omap*
 F:     arch/arm/*omap*/usb*
 
 OMAP GPIO DRIVER
+M:     Javier Martinez Canillas <javier@dowhile0.org>
 M:     Santosh Shilimkar <santosh.shilimkar@ti.com>
 M:     Kevin Hilman <khilman@deeprootsystems.com>
 L:     linux-omap@vger.kernel.org
@@ -6707,6 +6710,7 @@ F:        Documentation/PCI/
 F:     drivers/pci/
 F:     include/linux/pci*
 F:     arch/x86/pci/
+F:     arch/x86/kernel/quirks.c
 
 PCI DRIVER FOR IMX6
 M:     Richard Zhu <r65037@freescale.com>
@@ -6754,6 +6758,14 @@ L:       linux-pci@vger.kernel.org
 S:     Maintained
 F:     drivers/pci/host/*designware*
 
+PCI DRIVER FOR GENERIC OF HOSTS
+M:     Will Deacon <will.deacon@arm.com>
+L:     linux-pci@vger.kernel.org
+L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:     Maintained
+F:     Documentation/devicetree/bindings/pci/host-generic-pci.txt
+F:     drivers/pci/host/pci-host-generic.c
+
 PCMCIA SUBSYSTEM
 P:     Linux PCMCIA Team
 L:     linux-pcmcia@lists.infradead.org