- Merge with Linux 2.1.121.

 - Bugfixes.

1 files changed, 30 insertions, 18 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 9fbebebbd..322063663 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -47,6 +47,10 @@ trivial patch so apply some common sense.
 
 Maintainers List (try to look for most precise areas first)
 
+Note: For the hard of thinking, this list is meant to remain in Alphabetical
+order. If you could add yourselves to it in Alphabetical order that would
+so much easier [Ed]
+
 P: Person
 M: Mail patches to
 L: Mailing list that is relevant to this area
@@ -66,7 +70,7 @@ S: Status, one of the following:
 
 3C501 NETWORK DRIVER
 P:	Alan Cox
-M:	net-patches@lxorguk.ukuu.org.uk
+M:	alan@the.3c501.cabal.tm
 L:	linux-net@vger.rutgers.edu
 S:	Maintained
 
@@ -124,6 +128,19 @@ M:	layes@loran.com
 L:	linux-net@vger.rutgers.edu
 S:	Maintained
 
+ARM MFM AND FLOPPY DRIVERS
+P:	Dave Gilbert
+M:	linux@treblig.org
+S:	Maintained
+
+ARM PORT
+P:	Russell King
+M:	linux@arm.uk.linux.org
+L:	linux-arm@vger.rutgers.edu
+L:	arm-linux@tardis.ed.ac.uk
+W:	http://www.arm.uk.linux.org/~rmk/armlinux.html
+S:	Maintained
+
 AX.25 NETWORK LAYER
 P:	Jon Naylor
 M:	jsn@cs.nott.ac.uk
@@ -365,7 +382,7 @@ P:	Alan Cox
 M:	Alan.Cox@linux.org
 W:	http://www.mac.linux-m68k.org/home.html
 L:	linux-mac68k@wave.lm.com
-S:	Maintained
+S:	As time permits [Michael confess, you are the mac68k maintainer 8)]
 
 MENUCONFIG:
 P:	Michael Elizabeth Chastain
@@ -454,7 +471,7 @@ M:	tim@cyberelk.demon.co.uk
 P:	David Campbell
 M:	campbell@torque.net
 P:	Andrea Arcangeli
-M:	arcangeli@mbox.queen.it
+M:	andrea@e-mind.com
 L:	linux-parport@torque.net
 L:	pnp-list@redhat.com
 W:	http://www.cyberelk.demon.co.uk/parport.html
@@ -487,7 +504,7 @@ W:	http://www.ife.ee.ethz.ch/~sailer/linux/pciaudio.html
 S:	Maintained
 
 PCNET32 NETWORK DRIVER
-P:	Thomas Bogendoerfer
+P:	Thomas Bogendörfer
 M:	tsbogend@alpha.franken.de
 L:	linux-net@vger.rutgers.edu
 S:	Maintained
@@ -546,10 +563,16 @@ M:	torvalds@transmeta.com
 L:	linux-smp@vger.rutgers.edu
 S:	Maintained
 
+SONIC NETWORK DRIVER
+P:	Thomas Bogendoerfer
+M:	tsbogend@alpha.franken.de
+L:	linux-net@vger.rutgers.edu
+S:	Maintained
+
 SOUND
 P:	Alan Cox 
-M:	Alan.Cox@linux.org
-S:	Maintained
+M:	alan@redhat.com
+S:	Supported
 
 SPARC:
 P:	Eddie C. Dost
@@ -641,6 +664,7 @@ S:	Maintained
 VIDEO FOR LINUX
 P:	Alan Cox
 M:	Alan.Cox@linux.org
+W:	http://roadrunner.swansea.linux.org.uk/v4l.shtml
 S:	Maintained
 
 WAN ROUTER AND SANGOMA WANPIPE DRIVERS (X.25, FRAME RELAY, PPP)
@@ -669,18 +693,6 @@ W:	http://qsl.net/dl1bke/
 L:	linux-hams@vger.rutgers.edu
 S:	Maintained
 
-ARM PORT
-P:	Russell King
-M:	linux@arm.uk.linux.org
-L:	linux-arm@vger.rutgers.edu
-L:	arm-linux@tardis.ed.ac.uk
-W:	http://www.arm.uk.linux.org/~rmk/armlinux.html
-S:	Maintained
-
-ARM MFM AND FLOPPY DRIVERS
-P:	Dave Gilbert
-M:	linux@treblig.org
-S:	Maintained
 
 REST:
 P:	Linus Torvalds