This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c8c25df..79cfc19 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -632,7 +632,7 @@ S:  Maintained
 
 DEFXX FDDI NETWORK DRIVER
 P:     Maciej W. Rozycki
-M:     macro@linux-mips.org
+M:     macro@ds2.pg.gda.pl
 S:     Maintained
 
 DELL LAPTOP SMM DRIVER
@@ -1283,13 +1283,6 @@ W:       http://www.penguinppc.org/
 L:     linuxppc-embedded@lists.linuxppc.org
 S:     Maintained
 
-LINUX FOR POWERPC EMBEDDED PPC8XX AND BOOT CODE
-P:     Tom Rini
-M:     trini@kernel.crashing.org
-W:     http://www.penguinppc.org/
-L:     linuxppc-embedded@lists.linuxppc.org
-S:     Maintained
-
 LINUX FOR POWERPC EMBEDDED PPC85XX
 P:     Kumar Gala
 M:     kumar.gala@freescale.com
@@ -1331,14 +1324,11 @@ M:      matthew@wil.cx
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
 
-M68K ARCHITECTURE
-P:     Geert Uytterhoeven
-M:     geert@linux-m68k.org
-P:     Roman Zippel
-M:     zippel@linux-m68k.org
+M68K
+P:     Jes Sorensen
+M:     jes@trained-monkey.org
+W:     http://www.clark.net/pub/lawrencc/linux/index.html
 L:     linux-m68k@lists.linux-m68k.org
-W:     http://www.linux-m68k.org/
-W:     http://linux-m68k-cvs.ubb.ca/
 S:     Maintained
 
 M68K ON APPLE MACINTOSH
@@ -1384,7 +1374,7 @@ MEMORY TECHNOLOGY DEVICES
 P:     David Woodhouse
 M:     dwmw2@redhat.com
 W:     http://www.linux-mtd.infradead.org/
-L:     linux-mtd@lists.infradead.org
+L:     mtd@infradead.org
 S:     Maintained
 
 MICROTEK X6 SCANNER
@@ -1504,8 +1494,6 @@ P:        James Morris
 M:     jmorris@redhat.com
 P:     Hideaki YOSHIFUJI
 M:     yoshfuji@linux-ipv6.org
-P:     Patrick McHardy
-M:     kaber@coreworks.de
 L:     netdev@oss.sgi.com
 S:     Maintained
 
@@ -1569,7 +1557,7 @@ S:        Maintained
 ONSTREAM SCSI TAPE DRIVER
 P:     Willem Riede
 M:     osst@riede.org
-L:     osst-users@lists.sourceforge.net
+L:     osst@linux1.onstream.nl
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
 
@@ -1957,8 +1945,8 @@ L:        ultralinux@vger.kernel.org
 S:     Maintained
 
 SPARC (sparc32):
-P:     William L. Irwin
-M:     wli@holomorphy.com
+P:     Keith M. Wesolowski
+M:     wesolows@foobazco.org
 L:     sparclinux@vger.kernel.org
 S:     Maintained