2.0.40

diff -urN linux-2.0.39/MAINTAINERS linux-2.0.40/MAINTAINERS
--- linux-2.0.39/MAINTAINERS   2001-01-09 13:29:20.000000000 -0800
+++ linux-2.0.40/MAINTAINERS   2004-02-07 23:13:01.000000000 -0800
@@ -1,53 +1,46 @@
    List of maintainers and how to submit kernel changes
 
-Please try to follow the guidelines below.  This will make things
-easier on the maintainers.  Not all of these guidelines matter for every
-trivial patch so apply some common sense.
-
-1.   Always _test_ your changes, however small, on at least 4 or
-   5 people, preferably many more.
-
-2.   Try to release a few ALPHA test versions to the net. Announce
-   them onto the kernel channel and await results. This is especially
-   important for device drivers, because often that's the only way
-   you will find things like the fact version 3 firmware needs
-   a magic fix you didn't know about, or some clown changed the
-   chips on a board and not its name.  (Don't laugh!  Look at the
-   SMC etherpower for that.)
-
-3.   Make sure your changes compile correctly in multiple
-   configurations. In particular check that changes work both as a
-   module and built into the kernel.
+Please try to follow the guidelines below. This will make things easier
+on the maintainers. Not all of these guidelines matter for every trivial
+patch so apply some common sense.
+
+1.   Always _test_ your changes, however small, on at least 4 or 5 people,
+   preferably many more.
+
+2.   Try to release a few ALPHA test versions to the net. Announce them
+   onto the kernel channel and await results. This is especially
+   important for device drivers, because often that's the only way you
+   will find things like the fact version 3 firmware needs a magic fix
+   you didn't know about, or some clown changed the chips on a board
+   and not its name. (Don't laugh! Look at the SMC etherpower for that.)
+
+3.   Make sure your changes compile correctly in multiple configurations.
+   In particular check that changes work both as a module and built into
+   the kernel.
 
 4.   When you are happy with a change make it generally available for
    testing and await feedback.
 
 5.   Make a patch available to the relevant maintainer in the list. Use
-   'diff -u' to make the patch easy to merge. Be prepared to get your
-   changes sent back with seemingly silly requests about formatting
-   and variable names.  These aren't as silly as they seem. One
-   job the maintainers (and especially Linus) do is to keep things
-   looking the same. Sometimes this means that the clever hack in
-   your driver to get around a problem actual needs to become a
-   generalised kernel feature ready for next time. See
-   Documentation/CodingStyle for guidance here.
-
-   PLEASE try to include any credit lines you want added with the
-   patch. It avoids people being missed off by mistake and makes
-   it easier to know who wants adding and who doesn't.
-
-   PLEASE document known bugs. If it doesn't work for everything
-   or does something very odd once a month document it.
-
-6.   Make sure you have the right to send any changes you make. If you
-   do changes at work you may find your employer owns the patch
-   not you.
+   'diff -u5' to make the patch easy to merge. Be prepared to get your
+   changes sent back with seemingly silly requests about formatting and
+   variable names. These aren't as silly as they seem. One job the
+   maintainers (and especially Linus) do is to keep things looking the
+   same. Sometimes this means that the clever hack in your driver to get
+   around a problem actual needs to become a generalised kernel feature
+   ready for next time. See Documentation/CodingStyle for guidance here.
+
+   PLEASE try to include any credit lines you want added with the patch.
+   It avoids people being missed off by mistake and makes it easier to
+   know who wants adding and who doesn't.
 
-7.   Happy hacking.
+   PLEASE document known bugs. If it doesn't work for everything or does
+   something very odd once a month document it.
 
+6.   Make sure you have the right to send any changes you make. If you do
+   changes at work you may find your employer owns the patch not you.
 
-[This file is new: I've just put the existing network contacts in, other
- people please add yourselves] -- AC
+7.   Happy hacking.
 
       -----------------------------------
 
@@ -60,7 +53,7 @@
 S: Status, one of the following:
 
    Supported:   Someone is actually paid to look after this (wildly
-         improbable).
+         improbable, but does occasionally happen).
    Maintained:   Someone actually looks after it.
    Odd Fixes:   It has a maintainer but they don't have time to do
          much other than throw the odd patch in. See below..
@@ -84,7 +77,7 @@
 
 8390 NETWORK DRIVERS [WD80x3/SMC-ELITE, SMC-ULTRA, NE2000, 3C503, etc.]
 P:   Paul Gortmaker
-M:   gpg109@rsphy1.anu.edu.au
+M:   p_gortmaker@yahoo.com
 L:   linux-net@vger.kernel.org
 S:   Maintained
 
@@ -97,21 +90,21 @@
 
 AHA152X SCSI DRIVER
 P:   Juergen E. Fischer
-M:   Juergen Fischer <fischer@et-inf.fho-emden.de>
+M:   Juergen Fischer <fischer@norbit.de>
 L:   linux-scsi@vger.kernel.org
 S:   Maintained
 
 APM DRIVER
 P:   Stephen Rothwell
-M:   apm@linuxcare.com.au
+M:   sfr@canb.auug.org.au
 L:   linux-laptop@vger.kernel.org
-W:   http://linuxcare.com.au/apm/
-S:   Maintained
+W:   http://www.canb.auug.org.au/~sfr/
+S:   Supported
 
 APPLETALK NETWORK LAYER
 P:   Jay Schulist
-M:   Jay.Schulist@spacs.k12.wi.us
-L:   linux-atalk@netspace.org
+M:   jschlst@samba.org
+L:   linux-atalk@lists.netspace.org
 S:   Maintained
 
 ARPD SUPPORT
@@ -120,27 +113,12 @@
 L:   linux-net@vger.kernel.org
 S:   Maintained
 
-AX.25 DAMA SLAVE
-P:   Joerg Reuter
-M:   jreuter@poboxes.com
-W:   http://poboxes.com/jreuter/
-W:   http://qsl.net/dl1bke/
-L:   linux-hams@vger.kernel.org
-S:   Maintained
-
 AX.25 NETWORK LAYER
 P:   Matthias Welwarsky
 M:   dg2fef@afthd.tu-darmstadt.de
 L:   linux-hams@vger.kernel.org
 S:   Maintained
 
-BUSLOGIC SCSI DRIVER
-P:   Leonard N. Zubkoff
-M:   Leonard N. Zubkoff <lnz@dandelion.com>
-L:   linux-scsi@vger.kernel.org
-W:   http://www.dandelion.com/Linux/
-S:   Maintained
-
 CREDITS FILE
 P:   John A. Martin
 M:   jam@acm.org
@@ -148,14 +126,16 @@
 
 CYCLADES ASYNC MUX DRIVER
 P:   Ivan Passos
-M:   Ivan Passos <ivan@cyclades.com>
+M:   ivan@cyclades.com
 W:   http://www.cyclades.com/
 S:   Supported
 
-DAC960 RAID DRIVER
-P:   Leonard N. Zubkoff
-M:   Leonard N. Zubkoff <lnz@dandelion.com>
-L:   linux-raid@vger.kernel.org
+DAMA SLAVE for AX.25
+P:   Joerg Reuter
+M:   jreuter@yaina.de
+W:   http://yaina.de/jreuter/
+W:   http://qsl.net/dl1bke/
+L:   linux-hams@vger.kernel.org
 S:   Maintained
 
 DC390/AM53C974 SCSI driver
@@ -176,19 +156,20 @@
 L:   linux-kernel@vger.kernel.org
 S:   Maintained
 
-DIGIBOARD DRIVER
-P:   Christoph Lameter
-M:   clameter@fuller.edu
-L:   digiboard@list.fuller.edu
-S:   Maintained
-
 DIGI RIGHTSWITCH NETWORK DRIVER
 P:   Rick Richardson
-M:   rick@dgii.com
+M:   rick@remotepoint.com
 L:   linux-net@vger.kernel.org
 W:   http://www.dgii.com/linux/
 S:   Maintained
 
+DIGIBOARD DRIVER
+P:   Christoph Lameter
+M:   christoph@lameter.com
+W:   http://www.dgii.com/linux,http://lameter.com/digi
+L:   digilnux@dgii.com
+S:   Maintained
+
 EATA-DMA SCSI DRIVER
 P:   Michael Neuffer
 M:   mike@i-Connect.Net
@@ -197,7 +178,7 @@
 
 EATA ISA/EISA/PCI SCSI DRIVER
 P:   Dario Ballabio
-M:   dario@milano.europe.dg.com
+M:   ballabio_dario@emc.com
 L:   linux-scsi@vger.kernel.org
 S:   Maintained
 
@@ -214,10 +195,8 @@
 S:   Maintained
 
 EXT2 FILE SYSTEM
-P:   Remy Card
-M:   Remy.Card@linux.org
-L:   linux-kernel@vger.kernel.org
-S:   Maintained
+L:   ext2-devel@lists.sourceforge.net
+S:   Odd fixes
 
 FILE LOCKING (flock() and fcntl()/lockf())
 P:   Andy Walker
@@ -256,12 +235,21 @@
 L:   linux-kernel@vger.kernel.org
 S:   Maintained
 
+i386 BOOT CODE
+P:   Riley Williams
+M:   Riley@Williams.Name
+L:   linux-kernel@vger.kernel.org
+S:   Odd fixes
+
 IDE DRIVER [GENERAL]
 P:   Andre Hedrick
 M:   andre@linux-ide.org
+M:   andre@linuxdiskcert.org
 L:   linux-kernel@vger.kernel.org
-W:   http://linux.kernel.org/pub/linux/kernel/people/hedrick/
-S:   Supported
+W:   http://www.kernel.org/pub/linux/kernel/people/hedrick/
+W:   http://www.linux-ide.org/
+W:   http://www.linuxdiskcert.org/
+S:   Maintained
 
 IDE/ATAPI CDROM DRIVER 
 P:   Jens Axboe
@@ -297,7 +285,9 @@
 
 ISDN SUBSYSTEM HISAX
 P:   Karsten Keil
-M:   keil@isdn4linux.de
+M:   kkeil@suse.de
+P:   Kai Germaschewski
+M:   kai.germaschewski@gmx.de
 L:   isdn4linux@listserv.isdn4linux.de
 W:   http://www.isdn4linux.de
 S:   Maintained
@@ -309,8 +299,8 @@
 S:   Maintained
 
 LANCE AND LANCE32 NETWORK DRIVER
-P:   Thomas Bogendoerfer
-M:   tsbogend@bigbug.franken.de
+P:   Thomas Bogendörfer
+M:   tsbogend@alpha.franken.de
 L:   linux-net@vger.kernel.org
 S:   Maintained
 
@@ -423,20 +413,17 @@
 
 SVGA HANDLING
 P:   Martin Mares
-M:   mj@atrey.karlin.mff.cuni.cz
+M:   mj@ucw.cz
 L:   linux-video@atrey.karlin.mff.cuni.cz
 S:   Maintained
 
-THE V2.0 KERNEL IN GENERAL
-P:   David Weinehall
-M:   tao@acc.umu.se
-L:   linux-kernel@vger.kernel.org
-S:   Maintained
-
 TLAN NETWORK DRIVER
 P:   Torben Mathiasen
 M:   torben.mathiasen@compaq.com
+M:   torben@kernel.dk
 L:   tlan@vuser.vu.union.edu
+L:   linux-net@vger.kernel.org
+W:   http://tlan.kernel.dk
 S:   Maintained
 
 TOKEN-RING NETWORK DRIVER
@@ -448,13 +435,13 @@
 
 U14-34F SCSI DRIVER
 P:   Dario Ballabio
-M:   dario@milano.europe.dg.com
+M:   ballabio_dario@emc.com
 L:   linux-scsi@vger.kernel.org
 S:   Maintained
 
 VFAT FILESYSTEM
 P:   Gordon Chaffee
-M:   chaffee@plateau.cs.berkeley.edu
+M:   chaffee@cs.berkeley.edu
 L:   linux-kernel@vger.kernel.org
 W:   http://bmrc.berkeley.edu/people/chaffee
 S:   Maintained
@@ -473,12 +460,14 @@
 
 Z8530 SCC DRIVER FOR AX.25
 P:   Joerg Reuter
-M:   jreuter@poboxes.com
-W:   http://poboxes.com/jreuter/
-W:   http://qsl.net/dl1bke/
+M:   jreuter@yaina.de
+W:   http://yaina.de/jreuter/
+W:   http://www.qsl.net/dl1bke/
 L:   linux-hams@vger.kernel.org
 S:   Maintained
 
 THE REST
-P:   Linus Torvalds
-S:   Buried alive in email
+P:   David Weinehall
+M:   tao@kernel.org
+L:   linux-kernel@vger.kernel.org
+S:   Maintained