2.6.1

diff -Nru a/MAINTAINERS b/MAINTAINERS
--- a/MAINTAINERS   Thu Jan  8 23:00:24 2004
+++ b/MAINTAINERS   Thu Jan  8 23:00:24 2004
@@ -73,7 +73,7 @@
 3C359 NETWORK DRIVER
 P:   Mike Phillips
 M:   mikep@linuxtr.net
-L:   linux-net@vger.rutgers.edu
+L:   linux-net@vger.kernel.org
 L:   linux-tr@linuxtr.net
 W:   http://www.linuxtr.net
 S:   Maintained
@@ -929,8 +929,9 @@
 S:   Maintained
 
 SN-IA64 (Itanium) SUB-PLATFORM
-P:   John Hesterberg
-M:   jh@sgi.com
+P:   Jesse Barnes
+M:   jbarnes@sgi.com
+L:   linux-altix@sgi.com
 L:   linux-ia64@linuxia64.org
 W:   http://www.sgi.com/altix
 S:   Maintained
@@ -979,25 +980,28 @@
 P:   Ben Collins
 M:   bcollins@debian.org
 L:   linux1394-devel@lists.sourceforge.net
-W:   http://linux1394.sourceforge.net/
+W:   http://www.linux1394.org/
 S:   Maintained
 
 IEEE 1394 OHCI DRIVER
 P:   Ben Collins
 M:   bcollins@debian.org
 L:   linux1394-devel@lists.sourceforge.net
+W:   http://www.linux1394.org/
 S:   Maintained
 
 IEEE 1394 PCILYNX DRIVER
 P:   Andreas Bombe
 M:   andreas.bombe@munich.netsurf.de
 L:   linux1394-devel@lists.sourceforge.net
+W:   http://www.linux1394.org/
 S:   Maintained
 
 IEEE 1394 RAW I/O DRIVER
-P:   Andreas Bombe
-M:   andreas.bombe@munich.netsurf.de
+P:   Ben Collins
+M:   bcollins@debian.org
 L:   linux1394-devel@lists.sourceforge.net
+W:   http://www.linux1394.org/
 S:   Maintained
 
 IMS TWINTURBO FRAMEBUFFER DRIVER
@@ -1234,8 +1238,8 @@
 S:   Maintained
 
 LSILOGIC/SYMBIOS/NCR 53C8XX and 53C1010 PCI-SCSI drivers
-P:   Gerard Roudier
-M:   groudier@free.fr
+P:   Matthew Wilcox
+M:   matthew@wil.cx
 L:   linux-scsi@vger.kernel.org
 S:   Maintained
 
@@ -1468,7 +1472,7 @@
 P:   Willem Riede
 M:   osst@riede.org
 L:   osst@linux1.onstream.nl
-L:   linux-scsi@vger.rutgers.edu
+L:   linux-scsi@vger.kernel.org
 S:   Maintained
 
 OPL3-SA2, SA3, and SAx DRIVER
@@ -1556,11 +1560,8 @@
 S:   Maintained
 
 PCMCIA SUBSYSTEM
-P:   David Hinds
-M:   dahinds@users.sourceforge.net
-L:   linux-kernel@vger.kernel.org
-W:   http://pcmcia-cs.sourceforge.net
-S:   Maintained
+L:   http://lists.infradead.org/mailman/listinfo/linux-pcmcia
+S:   Unmaintained
 
 PCNET32 NETWORK DRIVER
 P:   Thomas Bogendörfer
@@ -1852,8 +1853,10 @@
 S:   Maintained
 
 SPARC (sparc32):
+P:   Keith M. Wesolowski
+M:   wesolows@foobazco.org
 L:   sparclinux@vger.kernel.org
-S:   Unmaintained - please send patches to mailing list
+S:   Maintained
 
 SPECIALIX IO8+ MULTIPORT SERIAL CARD DRIVER
 P:   Roger Wolff
@@ -2216,6 +2219,13 @@
 P:   David Brownell
 M:   dbrownell@users.sourceforge.net
 L:   linux-usb-devel@lists.sourceforge.net
+S:   Maintained
+
+USB W996[87]CF DRIVER
+P:   Luca Risolia
+M:   luca_ing@libero.it
+L:   linux-usb-devel@lists.sourceforge.net
+W:   http://go.lamarinapunto.com
 S:   Maintained
 
 USER-MODE LINUX