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

[linux-beck.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index ea781c1cfb5a159e01093f11311fc0c4f95042a0..f7b0ced81116bdd02a0535270ff5efc9e5231600 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3139,6 +3139,7 @@ S:        Supported
 F:     Documentation/s390/kvm.txt
 F:     arch/s390/include/asm/kvm*
 F:     arch/s390/kvm/
+F:     drivers/s390/kvm/
 
 KEXEC
 M:     Eric Biederman <ebiederm@xmission.com>
@@ -4195,6 +4196,13 @@ W:       http://www.pmc-sierra.com/
 S:     Supported
 F:     drivers/scsi/pmcraid.*
 
+PMC SIERRA PM8001 DRIVER
+M:     jack_wang@usish.com
+M:     lindar_liu@usish.com
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+F:     drivers/scsi/pm8001/
+
 POSIX CLOCKS and TIMERS
 M:     Thomas Gleixner <tglx@linutronix.de>
 S:     Supported
@@ -4553,6 +4561,7 @@ L:        linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     arch/s390/
+F:     drivers/s390/
 
 S390 NETWORK DRIVERS
 M:     Ursula Braun <ursula.braun@de.ibm.com>
@@ -4568,6 +4577,7 @@ M:        Felix Beck <felix.beck@de.ibm.com>
 M:     Ralph Wuerthner <ralph.wuerthner@de.ibm.com>
 M:     linux390@de.ibm.com
 L:     linux-s390@vger.kernel.org
+W:     http://www.ibm.com/developerworks/linux/linux390/
 S:     Supported
 F:     drivers/s390/crypto/
 
@@ -5769,6 +5779,14 @@ L:       netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/vmxnet3/
 
+VMware PVSCSI driver
+M:     Alok Kataria <akataria@vmware.com>
+M:     VMware PV-Drivers <pv-drivers@vmware.com>
+L:     linux-scsi@vger.kernel.org
+S:     Maintained
+F:     drivers/scsi/vmw_pvscsi.c
+F:     drivers/scsi/vmw_pvscsi.h
+
 VOLTAGE AND CURRENT REGULATOR FRAMEWORK
 M:     Liam Girdwood <lrg@slimlogic.co.uk>
 M:     Mark Brown <broonie@opensource.wolfsonmicro.com>