2.4.29

diff -urN linux-2.4.28/MAINTAINERS linux-2.4.29/MAINTAINERS
--- linux-2.4.28/MAINTAINERS   2004-11-17 03:54:21.000000000 -0800
+++ linux-2.4.29/MAINTAINERS   2005-01-19 06:09:24.805052327 -0800
@@ -80,7 +80,7 @@
 
 3C505 NETWORK DRIVER
 P:   Philip Blundell
-M:   Philip.Blundell@pobox.com
+M:   philb@gnu.org
 L:   linux-net@vger.kernel.org
 S:   Maintained
 
@@ -579,6 +579,11 @@
 L:   linux-decnet-user@lists.sourceforge.net
 S:   Maintained
 
+DEFXX FDDI NETWORK DRIVER
+P:   Maciej W. Rozycki
+M:   macro@linux-mips.org
+S:   Maintained
+
 DELL LAPTOP SMM DRIVER
 P:   Massimo Dal Zotto
 M:   dz@debian.org
@@ -694,7 +699,7 @@
 
 ETHEREXPRESS-16 NETWORK DRIVER
 P:   Philip Blundell
-M:   Philip.Blundell@pobox.com
+M:   philb@gnu.org
 L:   linux-net@vger.kernel.org
 S:   Maintained
 
@@ -836,7 +841,7 @@
 
 i386 SETUP CODE / CPU ERRATA WORKAROUNDS
 P:   Dave Jones
-M:   davej@suse.de
+M:   davej@redhat.com
 P:   H. Peter Anvin
 M:   hpa@zytor.com
 S:   Maintained
@@ -971,11 +976,12 @@
 S:   Supported
 
 INTERMEZZO FILE SYSTEM
-P:   Chen Yang
-M:   intermezzo-devel@lists.sourceforge.net
+P:   Peter J. Braam
+M:   braam@clusterfs.com
 W:      http://www.inter-mezzo.org/
+W:   http://sourceforge.net/projects/intermezzo/
 L:      intermezzo-discuss@lists.sourceforge.net
-S:      Maintained
+S:   Orphan
 
 IOC3 DRIVER
 P:   Ralf Baechle
@@ -1415,13 +1421,13 @@
 
 PARALLEL PORT SUPPORT
 P:   Phil Blundell
-M:   Philip.Blundell@pobox.com
+M:   philb@gnu.org
 P:   Tim Waugh
 M:   tim@cyberelk.net
 P:   David Campbell
 M:   campbell@torque.net
 P:   Andrea Arcangeli
-M:   andrea@e-mind.com
+M:   andrea@suse.de
 L:   linux-parport@torque.net
 W:   http://people.redhat.com/twaugh/parport/
 S:   Maintained
@@ -1496,13 +1502,6 @@
 W:   http://www.realitydiluted.com/projects/nino
 S:   Maintained
 
-PHILIPS NINO PALM PC
-P:   Steven Hill
-M:   sjhill@realitydiluted.com
-L:   linux-mips@oss.sgi.com
-W:   http://www.realitydiluted.com/projects/nino
-S:   Maintained
-
 PNP SUPPORT
 P:   Tom Lees
 M:   tom@lpsg.demon.co.uk
@@ -1775,11 +1774,6 @@
 L:   linux-kernel@vger.kernel.org
 S:   Maintained
 
-STALLION TECHNOLOGIES MULTIPORT SERIAL BOARDS
-M:   support@stallion.oz.au
-W:   http://www.stallion.com
-S:   Supported
-
 STARFIRE/DURALAN NETWORK DRIVER
 P:   Ion Badulescu
 M:   ionut@cs.columbia.edu