Merge branch 'fixes-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linvill...

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 0f60fdb47fbaa12c254cd9c11c185323f2396a18..2534dc4aa95a58cfe8b6d617f1ec424ac74a7d5f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -297,6 +297,12 @@ P: Colin Leroy
 M:     colin@colino.net
 S:     Maintained
 
+ADVANSYS SCSI DRIVER
+P:     Matthew Wilcox
+M:     matthew@wil.cx
+L:     linux-scsi@vger.kernel.org
+S:     Maintained
+
 AEDSP16 DRIVER
 P:     Riccardo Facchetti
 M:     fizban@tin.it
@@ -1763,7 +1769,7 @@ S:        Maintained
 
 HP100: Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
 P:     Jaroslav Kysela
-M:     perex@suse.cz
+M:     perex@perex.cz
 S:     Maintained
 
 HPET:  High Precision Event Timers driver (hpet.c)
@@ -1871,10 +1877,8 @@ T:       quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
 S:     Maintained
 
 IDE/ATAPI CDROM DRIVER
-P:     Alan Cox
-M:     alan@lxorguk.ukuu.org.uk
 L:     linux-ide@vger.kernel.org
-S:     Maintained
+S:     Unmaintained
 
 IDE/ATAPI FLOPPY DRIVERS
 P:     Paul Bristow
@@ -1889,6 +1893,11 @@ M:       Gadi Oxman <gadio@netvision.net.il>
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
+IDE-SCSI DRIVER
+L:     linux-ide@vger.kernel.org
+L:     linux-scsi@vger.kernel.org
+S:     Orphan
+
 IEEE 1394 SUBSYSTEM
 P:     Ben Collins
 M:     ben.collins@ubuntu.com
@@ -2121,14 +2130,12 @@ S:      Maintained
 
 ISAPNP
 P:     Jaroslav Kysela
-M:     perex@suse.cz
+M:     perex@perex.cz
 S:     Maintained
 
 ISDN SUBSYSTEM
 P:     Karsten Keil
 M:     kkeil@suse.de
-P:     Kai Germaschewski
-M:     kai.germaschewski@gmx.de
 L:     isdn4linux@listserv.isdn4linux.de
 W:     http://www.isdn4linux.de
 T:     git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git
@@ -2197,8 +2204,6 @@ L:        autofs@linux.kernel.org
 S:     Maintained
 
 KERNEL BUILD (kbuild: Makefile, scripts/Makefile.*)
-P:     Kai Germaschewski
-M:     kai@germaschewski.name
 P:     Sam Ravnborg
 M:     sam@ravnborg.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git
@@ -2229,7 +2234,7 @@ S:        Supported
 KEXEC
 P:     Eric Biederman
 M:     ebiederm@xmission.com
-W:     http://www.xmission.com/~ebiederm/files/kexec/
+W:     http://ftp.kernel.org/pub/linux/kernel/people/horms/kexec-tools/
 L:     linux-kernel@vger.kernel.org
 L:     kexec@lists.infradead.org
 S:     Maintained
@@ -2413,7 +2418,7 @@ LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI)
 P:     Eric Moore
 M:     Eric.Moore@lsi.com
 M:     support@lsi.com
-L:     mpt_linux_developer@lsi.com
+L:     DL-MPTFusionLinux@lsi.com
 L:     linux-scsi@vger.kernel.org
 W:     http://www.lsilogic.com/support
 S:     Supported
@@ -2481,7 +2486,7 @@ S:        Supported
 
 MAN-PAGES: MANUAL PAGES FOR LINUX -- Sections 2, 3, 4, 5, and 7
 P:     Michael Kerrisk
-M:     mtk-manpages@gmx.net
+M:     mtk.manpages@gmail.com
 W:     ftp://ftp.kernel.org/pub/linux/docs/manpages
 S:     Maintained
 
@@ -2935,13 +2940,6 @@ L:       linux-kernel@vger.kernel.org
 L:     linux-pci@atrey.karlin.mff.cuni.cz
 S:     Supported
 
-PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES)
-P:     Thomas Sailer
-M:     sailer@ife.ee.ethz.ch
-L:     linux-sound@vger.kernel.org
-W:     http://www.ife.ee.ethz.ch/~sailer/linux/pciaudio.html
-S:     Maintained
-
 PCI SUBSYSTEM
 P:     Greg Kroah-Hartman
 M:     gregkh@suse.de
@@ -3512,7 +3510,7 @@ S:        Maintained
 
 SOUND
 P:     Jaroslav Kysela
-M:     perex@suse.cz
+M:     perex@perex.cz
 L:     alsa-devel@alsa-project.org (subscribers-only)
 S:     Maintained
 
@@ -3702,7 +3700,7 @@ S:      Maintained
 
 TI OMAP MMC INTERFACE DRIVER
 P:     Carlos Aguiar, Anderson Briglia and Syed Khasim
-M:     linux-omap-open-source@linux.omap.com 
+M:     linux-omap-open-source@linux.omap.com (subscribers only)
 W:     http://linux.omap.com
 W:     http://www.muru.com/linux/omap/
 S:     Maintained