Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2bbe40ea4d10e8217dfa3e8b5b6e3d715814aca3..cdc2198db754f4e65a35da6a338adfe658d7258f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -88,7 +88,6 @@ S: Status, one of the following:
 P:     Mike Phillips
 M:     mikep@linuxtr.net
 L:     netdev@vger.kernel.org
-L:     linux-tr@linuxtr.net
 W:     http://www.linuxtr.net
 S:     Maintained
 
@@ -167,7 +166,6 @@ S:  Maintained
 
 A2232 SERIAL BOARD DRIVER
 P:     Enver Haase
-M:     ehaase@inf.fu-berlin.de
 M:     A2232@gmx.net
 L:     linux-m68k@lists.linux-m68k.org
 S:     Maintained
@@ -439,7 +437,7 @@ S:  Maintained
 
 ARM/ATMEL AT91RM9200 ARM ARCHITECTURE
 P:      Andrew Victor
-M:      linux@maxim.org.za
+M:      andrew@sanpeople.com
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:      http://maxim.org.za/at91_26.html
 S:      Maintained
@@ -1681,8 +1679,7 @@ S:        Maintained
 HARMONY SOUND DRIVER
 P:     Kyle McMartin
 M:     kyle@parisc-linux.org
-W:     http://www.parisc-linux.org/~kyle/harmony/
-L:     parisc-linux@lists.parisc-linux.org
+L:     linux-parisc@vger.kernel.org
 S:     Maintained
 
 HAYES ESP SERIAL DRIVER
@@ -2065,7 +2062,7 @@ S:        Maintained
 IOC3 SERIAL DRIVER
 P:     Pat Gefre
 M:     pfg@sgi.com
-L:     linux-kernel@linux-mips.org
+L:     linux-mips@linux-mips.org
 S:     Maintained
 
 IP MASQUERADING:
@@ -2598,13 +2595,6 @@ L:       https://tango.0pointer.de/mailman/listinfo/s270-linux
 W:     http://0pointer.de/lennart/tchibo.html
 S:     Maintained
 
-MTRR AND SIMILAR SUPPORT [i386]
-P:     Richard Gooch
-M:     rgooch@atnf.csiro.au
-L:     linux-kernel@vger.kernel.org
-W:     http://www.atnf.csiro.au/~rgooch/linux/kernel-patches.html
-S:     Maintained
-
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
 P:     Pierre Ossman
 M:     drzeus-mmc@drzeus.cx
@@ -2761,8 +2751,10 @@ S:       Maintained
 
 NFS CLIENT
 P:     Trond Myklebust
-M:     trond.myklebust@fys.uio.no
-L:     linux-kernel@vger.kernel.org
+M:     Trond.Myklebust@netapp.com
+L:     linux-nfs@vger.kernel.org
+W:     http://client.linux-nfs.org
+T:     git git://git.linux-nfs.org/pub/linux/nfs-2.6.git
 S:     Maintained
 
 NI5010 NETWORK DRIVER
@@ -2823,7 +2815,6 @@ M:        p2@ace.ulyssis.student.kuleuven.ac.be
 P:     Mike Phillips
 M:     mikep@linuxtr.net
 L:     netdev@vger.kernel.org
-L:     linux-tr@linuxtr.net
 W:     http://www.linuxtr.net
 S:     Maintained
 
@@ -2897,16 +2888,15 @@ W:      http://www.torque.net/linux-pp.html
 S:     Maintained
 
 PARISC ARCHITECTURE
+P:     Kyle McMartin
+M:     kyle@parisc-linux.org
 P:     Matthew Wilcox
 M:     matthew@wil.cx
 P:     Grant Grundler
 M:     grundler@parisc-linux.org
-P:     Kyle McMartin
-M:     kyle@parisc-linux.org
-L:     parisc-linux@parisc-linux.org
+L:     linux-parisc@vger.kernel.org
 W:     http://www.parisc-linux.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
-T:     cvs cvs.parisc-linux.org:/var/cvs/linux-2.6
 S:     Maintained
 
 PARAVIRT_OPS INTERFACE
@@ -2962,7 +2952,7 @@ S:        Supported
 PCMCIA SUBSYSTEM
 P:     Linux PCMCIA Team
 L:     linux-pcmcia@lists.infradead.org
-L:     http://lists.infradead.org/mailman/listinfo/linux-pcmcia
+W:     http://lists.infradead.org/mailman/listinfo/linux-pcmcia
 T:     git kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
 S:     Maintained
 
@@ -3711,11 +3701,6 @@ M:       nagar@watson.ibm.com
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
-TI PARALLEL LINK CABLE DRIVER
-P:     Romain Lievin
-M:     roms@lpg.ticalc.org
-S:     Maintained
-
 TIPC NETWORK LAYER
 P:     Per Liden
 M:     per.liden@ericsson.com
@@ -3740,7 +3725,6 @@ TOKEN-RING NETWORK DRIVER
 P:     Mike Phillips
 M:     mikep@linuxtr.net
 L:     netdev@vger.kernel.org
-L:     linux-tr@linuxtr.net
 W:     http://www.linuxtr.net
 S:     Maintained
 
@@ -4058,7 +4042,7 @@ S:        Maintained
 
 USER-MODE LINUX
 P:     Jeff Dike
-M:     jdike@karaya.com
+M:     jdike@addtoit.com
 L:     user-mode-linux-devel@lists.sourceforge.net
 L:     user-mode-linux-user@lists.sourceforge.net
 W:     http://user-mode-linux.sourceforge.net
@@ -4289,13 +4273,6 @@ L:       mjpeg-users@lists.sourceforge.net
 W:     http://mjpeg.sourceforge.net/driver-zoran/
 S:     Maintained
 
-ZR36120 VIDEO FOR LINUX DRIVER
-P:     Pauline Middelink
-M:     middelin@polyware.nl
-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