Merge branch 'upstream-fixes' into upstream

[linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f97657b..69398f0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -411,6 +411,7 @@ AX.25 NETWORK LAYER
 P:     Ralf Baechle
 M:     ralf@linux-mips.org
 L:     linux-hams@vger.kernel.org
+W:     http://www.linux-ax25.org/
 S:     Maintained
 
 BAYCOM/HDLCDRV DRIVERS FOR AX.25
@@ -420,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
@@ -1395,6 +1404,8 @@ P:        Jesse Brandeburg
 M:     jesse.brandeburg@intel.com
 P:     Jeff Kirsher
 M:     jeffrey.t.kirsher@intel.com
+P:     Auke Kok
+M:     auke-jan.h.kok@intel.com
 W:     http://sourceforge.net/projects/e1000/
 S:     Supported
 
@@ -1407,6 +1418,8 @@ P:        Jesse Brandeburg
 M:     jesse.brandeburg@intel.com
 P:     Jeff Kirsher
 M:     jeffrey.t.kirsher@intel.com
+P:     Auke Kok
+M:     auke-jan.h.kok@intel.com
 W:     http://sourceforge.net/projects/e1000/
 S:     Supported
 
@@ -1419,6 +1432,8 @@ P:        John Ronciak
 M:     john.ronciak@intel.com
 P:     Jesse Brandeburg
 M:     jesse.brandeburg@intel.com
+P:     Auke Kok
+M:     auke-jan.h.kok@intel.com
 W:     http://sourceforge.net/projects/e1000/
 S:     Supported
 
@@ -1457,6 +1472,13 @@ M:       support@pathscale.com
 L:     openib-general@openib.org
 S:     Supported
 
+IPMI SUBSYSTEM
+P:     Corey Minyard
+M:     minyard@acm.org
+L:     openipmi-developer@lists.sourceforge.net
+W:     http://openipmi.sourceforge.net/
+S:     Supported
+
 IPX NETWORK LAYER
 P:     Arnaldo Carvalho de Melo
 M:     acme@conectiva.com.br
@@ -1464,10 +1486,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
@@ -1556,9 +1579,7 @@ S:        Maintained
 
 KEXEC
 P:     Eric Biederman
-P:     Randy Dunlap
 M:     ebiederm@xmission.com
-M:     rdunlap@xenotime.net
 W:     http://www.xmission.com/~ebiederm/files/kexec/
 L:     linux-kernel@vger.kernel.org
 L:     fastboot@osdl.org
@@ -1588,6 +1609,11 @@ M:       James.Bottomley@HansenPartnership.com
 L:     linux-scsi@vger.kernel.org
 S:     Maintained
 
+LED SUBSYSTEM
+P:     Richard Purdie
+M:     rpurdie@rpsys.net
+S:     Maintained
+
 LEGO USB Tower driver
 P:     Juergen Stuber
 M:     starblue@users.sourceforge.net
@@ -1647,7 +1673,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
@@ -1871,6 +1897,7 @@ NETROM NETWORK LAYER
 P:     Ralf Baechle
 M:     ralf@linux-mips.org
 L:     linux-hams@vger.kernel.org
+W:     http://www.linux-ax25.org/
 S:     Maintained
 
 NETWORK BLOCK DEVICE
@@ -2058,8 +2085,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
@@ -2262,6 +2293,7 @@ ROSE NETWORK LAYER
 P:     Ralf Baechle
 M:     ralf@linux-mips.org
 L:     linux-hams@vger.kernel.org
+W:     http://www.linux-ax25.org/
 S:     Maintained
 
 RISCOM8 DRIVER
@@ -2492,6 +2524,12 @@ M:       perex@suse.cz
 L:     alsa-devel@alsa-project.org
 S:     Maintained
 
+SPI SUBSYSTEM
+P:     David Brownell
+M:     dbrownell@users.sourceforge.net
+L:     spi-devel-general@lists.sourceforge.net
+S:     Maintained
+
 TPM DEVICE DRIVER
 P:     Kylene Hall
 M:     kjhall@us.ibm.com
@@ -3060,13 +3098,6 @@ M:       khali@linux-fr.org
 L:     lm-sensors@lm-sensors.org
 S:     Odd Fixes
 
-WAN ROUTER & SANGOMA WANPIPE DRIVERS & API (X.25, FRAME RELAY, PPP, CISCO HDLC)
-P:     Nenad Corbic
-M:     ncorbic@sangoma.com
-M:     dm@sangoma.com
-W:     http://www.sangoma.com
-S:     Supported
-
 WATCHDOG DEVICE DRIVERS
 P:     Wim Van Sebroeck
 M:     wim@iguana.be