Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6d3c401ccdb6cb14e8b5c5248b7a99f1743cd109..564cbfa716b12dc498392cf1b83400a6c982bffb 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
@@ -1457,6 +1466,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
@@ -1778,12 +1794,12 @@ S:     linux-scsi@vger.kernel.org
 W:     http://megaraid.lsilogic.com
 S:     Maintained
 
-MEMORY TECHNOLOGY DEVICES
+MEMORY TECHNOLOGY DEVICES (MTD)
 P:     David Woodhouse
 M:     dwmw2@infradead.org
 W:     http://www.linux-mtd.infradead.org/
 L:     linux-mtd@lists.infradead.org
-T:     git kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6.git
+T:     git git://git.infradead.org/mtd-2.6.git
 S:     Maintained
 
 MICROTEK X6 SCANNER
@@ -1869,6 +1885,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
@@ -2056,8 +2073,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
@@ -2260,6 +2281,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