2.4.28-pre3

diff -Naur -p -X /home/marcelo/lib/dontdiff linux-2.4.27/MAINTAINERS linux-2.4.28-pre3/MAINTAINERS
--- linux-2.4.27/MAINTAINERS   2004-08-07 23:26:04.000000000 +0000
+++ linux-2.4.28-pre3/MAINTAINERS   2004-09-10 19:35:28.000000000 +0000
@@ -177,10 +177,8 @@ S:   Maintained
 
 AD1816 SOUND DRIVER
 P:   Thorsten Knabe
-M:   Thorsten Knabe <tek@rbg.informatik.tu-darmstadt.de>
-M:   Thorsten Knabe <tek01@hrzpub.tu-darmstadt.de>
-W:   http://www.student.informatik.tu-darmstadt.de/~tek/projects/linux.html
-W:   http://www.tu-darmstadt.de/~tek01/projects/linux.html
+M:   Thorsten Knabe <linux@thorsten-knabe.de>
+W:   http://linux.thorsten-knabe.de
 S:   Maintained
 
 ADVANSYS SCSI DRIVER
@@ -456,14 +454,20 @@ L:   omnibook@zurich.ai.mit.edu
 S:      Maintained
 
 
+HP 66Mhz FIBRE CHANNEL DRIVER
+P:   Chirag Kantharia
+M:   chirag.kantharia@hp.com
+L:   iss_storagedev@hp.com
+S:   Maintained
+
 HP SMART2 RAID DRIVER
-P:     Francis Wiran
-M:     francis.wiran@hp.com
+P:   Chirag Kantharia
+M:   chirag.kantharia@hp.com
 L:     iss_storagedev@hp.com
-S:   Odd Fixes
+S:   Maintained
 
-HP SMART CISS RAID DRIVER
-P:     Mike Miller, Michael Ni
+HP SMART ARRAY CISS RAID DRIVER (cciss)
+P:   Mike Miller
 M:     mike.miller@hp.com
 L:     iss_storagedev@hp.com
 S:   Supported
@@ -530,15 +534,7 @@ CRYPTO API
 P:   James Morris
 M:   jmorris@intercode.com.au
 P:   David S. Miller
-M:   davem@redhat.com
-MARVELL YUKON / SYSKONNECT DRIVER
-P:   Mirko Lindner
-M:    mlindner@syskonnect.de
-P:   Ralph Roesler
-M:    rroesler@syskonnect.de
-W:    http://www.syskonnect.com
-S:    Supported
-M:   davem@redhat.com
+M:   davem@davemloft.net
 W   http://samba.org/~jamesm/crypto/
 L:   linux-kernel@vger.kernel.org
 S:   Maintained
@@ -1188,6 +1184,14 @@ L:   linux-mips@linux-mips.org
 L:   netdev@oss.sgi.com
 S:   Supported
 
+MARVELL YUKON / SYSKONNECT DRIVER
+P:   Mirko Lindner
+M:    mlindner@syskonnect.de
+P:   Ralph Roesler
+M:    rroesler@syskonnect.de
+W:    http://www.syskonnect.com
+S:    Supported
+
 MATROX FRAMEBUFFER DRIVER
 P:   Petr Vandrovec
 M:   vandrove@vc.cvut.cz
@@ -1312,7 +1316,7 @@ S:   Maintained
 
 NETWORKING [IPv4/IPv6]
 P:   David S. Miller
-M:   davem@redhat.com
+M:   davem@davemloft.net
 P:   Alexey Kuznetsov
 M:   kuznet@ms2.inr.ac.ru
 P:   Pekka Savola (ipv6)
@@ -1448,9 +1452,8 @@ L:   linux-kernel@vger.kernel.org
 S:   Odd Fixes
 
 PCI HOTPLUG CORE
-P:   Greg Kroah-Hartman
-M:   greg@kroah.com
-M:   gregkh@us.ibm.com
+P:   Gary Hade
+M:   garyhade@us.ibm.com
 S:   Supported
 
 PCI HOTPLUG COMPAQ DRIVER
@@ -1723,7 +1726,7 @@ S:   Maintained
 
 UltraSPARC (sparc64):
 P:   David S. Miller
-M:   davem@redhat.com
+M:   davem@davemloft.net
 P:   Eddie C. Dost
 M:   ecd@skynet.be
 P:   Jakub Jelinek
@@ -1735,8 +1738,8 @@ L:   ultralinux@vger.kernel.org
 S:   Maintained
 
 SPARC (sparc32):
-P:   Keith M. Wesolowski
-M:   wesolows@foobazco.org
+P:   William L. Irwin
+M:   wli@holomorphy.com
 L:   sparclinux@vger.kernel.org
 S:   Maintained