[PATCH] Marcelo has moved

[linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 61060e8..cf147ae 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -421,6 +421,14 @@ L: linux-hams@vger.kernel.org
 W:     http://www.baycom.org/~tom/ham/ham.html
 S:     Maintained
 
+BCM43XX WIRELESS DRIVER
+P:     Michael Buesch
+M:     mb@bu3sch.de
+P:     Stefano Brivio
+M:     st3@riseup.net
+W:     http://bcm43xx.berlios.de/
+S:     Maintained
+
 BEFS FILE SYSTEM
 P:     Sergey S. Kostyliov
 M:     rathamahata@php4.ru
@@ -1472,10 +1480,11 @@ L:      netdev@vger.kernel.org
 S:     Maintained
 
 IRDA SUBSYSTEM
-P:     Jean Tourrilhes
+P:     Samuel Ortiz
+M:     samuel@sortiz.org
 L:     irda-users@lists.sourceforge.net (subscribers-only)
 W:     http://irda.sourceforge.net/
-S:     Odd Fixes
+S:     Maintained
 
 ISAPNP
 P:     Jaroslav Kysela
@@ -1653,7 +1662,7 @@ S:        Maintained
 
 LINUX FOR POWERPC EMBEDDED PPC8XX
 P:     Marcelo Tosatti
-M:     marcelo.tosatti@cyclades.com
+M:     marcelo@kvack.org
 W:     http://www.penguinppc.org/
 L:     linuxppc-embedded@ozlabs.org
 S:     Maintained
@@ -2065,8 +2074,12 @@ P:       Matthew Wilcox
 M:     matthew@wil.cx
 P:     Grant Grundler
 M:     grundler@parisc-linux.org
+P:     Kyle McMartin
+M:     kyle@parisc-linux.org
 L:     parisc-linux@parisc-linux.org
 W:     http://www.parisc-linux.org/
+T:     git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
+T:     cvs cvs.parisc-linux.org:/var/cvs/linux-2.6
 S:     Maintained
 
 PCI ERROR RECOVERY