--- zzzz-none-000/linux-2.4.17/MAINTAINERS	2001-12-21 17:41:53.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/MAINTAINERS	2004-11-24 13:22:34.000000000 +0000
@@ -1,4 +1,4 @@
-	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
@@ -68,7 +68,6 @@
 	Obsolete:	Old code. Something tagged obsolete generally means
 			it has been replaced by a better system and you
 			should be using that.
-
 3C501 NETWORK DRIVER
 P:	Alan Cox
 M:	alan@the.3c501.cabal.tm
@@ -490,7 +489,7 @@
 S:	Supported
 
 DSCC4 DRIVER
-P:	François Romieu
+P:	Fran‡ois Romieu
 M:	romieu@cogenit.fr
 M:	romieu@ensta.fr
 S:	Maintained
@@ -543,6 +542,12 @@
 M:      miku@iki.fi
 S:      Maintained
 
+ETHERNET, WATCHDOG TIMER AND GPIO DRIVERS ON IBM4XX
+P:	Armin Kuster
+M:	akuster@mvista.com
+L:	linuxppc-embedded@lists.linuxppc.org
+S:	Maintained
+
 EXT2 FILE SYSTEM
 P:	Remy Card
 M:	Remy.Card@linux.org
@@ -872,6 +877,12 @@
 W:	http://kbuild.sourceforge.net
 S:	Maintained 
 
+KGDB FOR I386 PLATFORM
+P:	George Anzinger
+M:	george@mvista.com
+L:	linux-net@vger.kernel.org
+S:	Supported
+
 KERNEL NFSD
 P:	Neil Brown
 M:	neilb@cse.unsw.edu.au
@@ -899,12 +910,25 @@
 L:	linux-scsi@vger.kernel.org
 S:	Maintained
 
+LINUX FOR EMBEDDED/CPCI POWERPC 6XX/7XX/74XX
+P:	Matt Porter
+M:	mporter@mvista.com
+S:	Maintained
+
 LINUX FOR IBM pSERIES (RS/6000)
 P:	Paul Mackerras
 M:	paulus@au.ibm.com
 W:	http://www.ibm.com/linux/ltc/projects/ppc
 S:	Supported
 
+LINUX FOR MPC8XX AND IBM4XX
+P:	Dan Malek
+P:	Tom Rini
+M:	dan@embeddededge.com
+M:	trini@kernel.crashing.org
+L:	linuxppc-embedded@lists.linuxppc.org
+S:	Maintained
+
 LINUX FOR POWERPC
 P:	Paul Mackerras
 M:	paulus@samba.org
@@ -918,6 +942,12 @@
 L:	linuxppc-dev@lists.linuxppc.org
 S:	Maintained
 
+LINUX FOR SYNERGY (GEMINI) VME/CPCI POWERPC
+P:	Val Henson
+M:	val@synergymicro.com
+W:	http://www.synergymicro.com/Software/Linux.html
+S:	Supported
+
 LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP Dynamic Disks)
 P:	Richard Russon (FlatCap)
 M:	ldm@flatcap.org
@@ -1213,7 +1243,7 @@
 S:	Maintained
 
 PCNET32 NETWORK DRIVER
-P:	Thomas Bogendörfer
+P:	Thomas Bogend÷rfer
 M:	tsbogend@alpha.franken.de
 L:	linux-net@vger.kernel.org
 S:	Maintained
@@ -1242,6 +1272,14 @@
 M:	mostrows@styx.uwaterloo.ca
 S:	Maintained
 
+PREEMPTIBLE KERNEL
+P:	Robert M. Love
+M:	rml@tech9.net
+L:	linux-kernel@vger.kernel.org
+L:	kpreempt-tech@lists.sourceforge.net
+W:	http://tech9.net/rml/linux
+S:	Maintained
+
 PROMISE DC4030 CACHING DISK CONTROLLER DRIVER
 P:	Peter Denison
 M:	promise@pnd-pc.demon.co.uk
@@ -1338,11 +1376,20 @@
 S:	Unmaintained
 
 SCSI TAPE DRIVER
-P:	Kai Mäkisara
+P:	Kai M„kisara
 M:	Kai.Makisara@metla.fi
 L:	linux-scsi@vger.kernel.org
 S:	Maintained
 
+SENSORS DRIVERS
+P:      Frodo Looijaard
+M:      frodol@dds.nl
+P:      Philip Edelbrock
+M:      phil@netroedge.com
+L:      sensors@stimpy.netroedge.com
+W:      http://www.lm-sensors.nu/
+S:      Maintained
+
 SGI VISUAL WORKSTATION 320 AND 540
 P:	Bent Hagemark
 M:	bh@sgi.com