Merge branch 'for-linus' of git://linux-nfs.org/~bfields/linux

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 76ac08e010997159a1cd0cb323cf7f1f3da41f3d..e78f62f13bacc60340e2fecbd2dd03691d290bc2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -194,13 +194,6 @@ M: jes@trained-monkey.org
 L:     linux-acenic@sunsite.dk
 S:     Maintained
 
-ACI MIXER DRIVER
-P:     Robert Siemer
-M:     Robert.Siemer@gmx.de
-L:     linux-sound@vger.kernel.org
-W:     http://www.stud.uni-karlsruhe.de/~uh1b/
-S:     Maintained
-
 IPS SCSI RAID DRIVER
 P:     Adaptec OEM Raid Solutions
 M:     aacraid@adaptec.com
@@ -272,21 +265,6 @@ L: linux-acpi@vger.kernel.org
 W:     http://acpi.sourceforge.net/
 S:     Supported
 
-AD1816 SOUND DRIVER
-P:     Thorsten Knabe
-M:     Thorsten Knabe <linux@thorsten-knabe.de>
-W:     http://linux.thorsten-knabe.de
-S:     Maintained
-
-AD1889 SOUND DRIVER
-P:     Kyle McMartin
-M:     kyle@parisc-linux.org
-P:     Thibaut Varene
-M:     T-Bone@parisc-linux.org
-W:     http://wiki.parisc-linux.org/AD1889
-L:     parisc-linux@lists.parisc-linux.org
-S:     Maintained
-
 ADM1025 HARDWARE MONITOR DRIVER
 P:     Jean Delvare
 M:     khali@linux-fr.org
@@ -935,6 +913,12 @@ M: mchan@broadcom.com
 L:     netdev@vger.kernel.org
 S:     Supported
 
+BSG (block layer generic sg v4 driver)
+P:     FUJITA Tomonori
+M:     fujita.tomonori@lab.ntt.co.jp
+L:     linux-scsi@vger.kernel.org
+S:     Supported
+
 BTTV VIDEO4LINUX DRIVER
 P:     Mauro Carvalho Chehab
 M:     mchehab@infradead.org
@@ -1404,13 +1388,6 @@ M:       raisch@de.ibm.com
 L:     general@lists.openfabrics.org
 S:     Supported
 
-EMU10K1 SOUND DRIVER
-P:     James Courtier-Dutton
-M:     James@superbug.demon.co.uk
-L:     emu10k1-devel@lists.sourceforge.net
-W:     http://sourceforge.net/projects/emu10k1/
-S:     Maintained
-
 EMULEX LPFC FC SCSI DRIVER
 P:     James Smart
 M:     james.smart@emulex.com
@@ -1763,6 +1740,7 @@ S:        Maintained
 i386 SETUP CODE / CPU ERRATA WORKAROUNDS
 P:     H. Peter Anvin
 M:     hpa@zytor.com
+T:     git.kernel.org:/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup.git
 S:     Maintained
 
 IA64 (Itanium) PLATFORM
@@ -2416,7 +2394,7 @@ P:        Artem Bityutskiy
 M:     dedekind@infradead.org
 W:     http://www.linux-mtd.infradead.org/
 L:     linux-mtd@lists.infradead.org
-T:     git git://git.infradead.org/ubi-2.6.git
+T:     git git://git.infradead.org/~dedekind/ubi-2.6.git
 S:     Maintained
 
 MICROTEK X6 SCANNER
@@ -2642,12 +2620,6 @@ M:       yokota@netlab.is.tsukuba.ac.jp
 W:     http://www.netlab.is.tsukuba.ac.jp/~yokota/izumi/ninja/
 S:     Maintained
 
-NON-IDE/NON-SCSI CDROM DRIVERS [GENERAL] (come on, crew - mark your responsibility)
-P:     Eberhard Moenkeberg
-M:     emoenke@gwdg.de
-L:     linux-kernel@vger.kernel.org
-S:     Maintained
-
 NTFS FILESYSTEM
 P:     Anton Altaparmakov
 M:     aia21@cantab.net
@@ -2730,12 +2702,6 @@ L:       osst-users@lists.sourceforge.net
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
 
-OPL3-SA2, SA3, and SAx DRIVER
-P:     Zwane Mwaikambo
-M:     zwane@arm.linux.org.uk
-L:     linux-sound@vger.kernel.org
-S:     Maintained
-
 OPROFILE
 P:     Philippe Elie
 M:     phil.el@wanadoo.fr
@@ -3140,12 +3106,6 @@ M:       michael@mihu.de
 W:     http://www.mihu.de/linux/saa7146
 S:     Maintained
 
-SBPCD CDROM DRIVER
-P:     Eberhard Moenkeberg
-M:     emoenke@gwdg.de
-L:     linux-kernel@vger.kernel.org
-S:     Maintained
-
 SC1200 WDT DRIVER
 P:     Zwane Mwaikambo
 M:     zwane@arm.linux.org.uk
@@ -4151,6 +4111,11 @@ W:       http://www.polyware.nl/~middelin/En/hobbies.html
 W:     http://www.polyware.nl/~middelin/hobbies.html
 S:     Maintained
 
+ZS DECSTATION Z85C30 SERIAL DRIVER
+P:     Maciej W. Rozycki
+M:     macro@linux-mips.org
+S:     Maintained
+
 THE REST
 P:     Linus Torvalds
 S:     Buried alive in reporters