[NET]: Fix netx-eth.c compilation.

[linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3002cc8..56e6159 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
@@ -1873,8 +1870,10 @@ T:       quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
 S:     Maintained
 
 IDE/ATAPI CDROM DRIVER
+P:     Borislav Petkov
+M:     bbpetkov@yahoo.de
 L:     linux-ide@vger.kernel.org
-S:     Unmaintained
+S:     Maintained
 
 IDE/ATAPI FLOPPY DRIVERS
 P:     Paul Bristow
@@ -1920,7 +1919,7 @@ INFINIBAND SUBSYSTEM
 P:     Roland Dreier
 M:     rolandd@cisco.com
 P:     Sean Hefty
-M:     mshefty@ichips.intel.com
+M:     sean.hefty@intel.com
 P:     Hal Rosenstock
 M:     hal.rosenstock@gmail.com 
 L:     general@lists.openfabrics.org
@@ -2032,7 +2031,7 @@ P:        James Ketrenos
 M:     jketreno@linux.intel.com
 L:     linux-wireless@vger.kernel.org
 L:     ipw2100-devel@lists.sourceforge.net
-L:     http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
+W:     http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:     http://ipw2100.sourceforge.net
 S:     Supported
 
@@ -2043,7 +2042,7 @@ P:        James Ketrenos
 M:     jketreno@linux.intel.com
 L:     linux-wireless@vger.kernel.org
 L:     ipw2100-devel@lists.sourceforge.net
-L:     http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
+W:     http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:     http://ipw2200.sourceforge.net
 S:     Supported
 
@@ -2065,7 +2064,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:
@@ -2492,6 +2491,12 @@ M:       mtk.manpages@gmail.com
 W:     ftp://ftp.kernel.org/pub/linux/docs/manpages
 S:     Maintained
 
+MARVELL LIBERTAS WIRELESS DRIVER
+P:     Dan Williams
+M:     dcbw@redhat.com
+L:     libertas-dev@lists.infradead.org
+S:     Maintained
+
 MARVELL MV643XX ETHERNET DRIVER
 P:     Dale Farnsworth
 M:     dale@farnsworth.org
@@ -2594,7 +2599,7 @@ S:        Maintained
 MSI LAPTOP SUPPORT
 P:     Lennart Poettering
 M:     mzxreary@0pointer.de
-L:     https://tango.0pointer.de/mailman/listinfo/s270-linux
+W:     https://tango.0pointer.de/mailman/listinfo/s270-linux
 W:     http://0pointer.de/lennart/tchibo.html
 S:     Maintained
 
@@ -2754,8 +2759,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
@@ -2816,7 +2823,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
 
@@ -2890,16 +2896,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
@@ -2955,7 +2960,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
 
@@ -3704,11 +3709,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
@@ -3733,7 +3733,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
 
@@ -4051,12 +4050,20 @@ 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
 S:     Maintained
 
+USERSPACE I/O (UIO)
+P:     Hans J. Koch
+M:     hjk@linutronix.de
+P:     Greg Kroah-Hartman
+M:     gregkh@suse.de
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+
 FAT/VFAT/MSDOS FILESYSTEM:
 P:     OGAWA Hirofumi
 M:     hirofumi@mail.parknet.co.jp
@@ -4282,13 +4289,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