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 fa92d0d3674bf35874c88d14d012b6a1218cb513..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
@@ -882,13 +891,34 @@ W:        http://ebtables.sourceforge.net/
 S:     Maintained
 
 EDAC-CORE
-P:      Doug Thompson
-M:      norsk5@xmission.com, dthompson@linuxnetworx.com
-P:      Dave Peterson
-M:      dsp@llnl.gov, dave_peterson@pobox.com
-L:      bluesmoke-devel@lists.sourceforge.net
-W:      bluesmoke.sourceforge.net
-S:      Maintained
+P:     Doug Thompson
+M:     norsk5@xmission.com, dthompson@linuxnetworx.com
+P:     Dave Peterson
+M:     dsp@llnl.gov, dave_peterson@pobox.com
+L:     bluesmoke-devel@lists.sourceforge.net
+W:     bluesmoke.sourceforge.net
+S:     Maintained
+
+EDAC-E752X
+P:     Dave Peterson
+M:     dsp@llnl.gov, dave_peterson@pobox.com
+L:     bluesmoke-devel@lists.sourceforge.net
+W:     bluesmoke.sourceforge.net
+S:     Maintained
+
+EDAC-E7XXX
+P:     Dave Peterson
+M:     dsp@llnl.gov, dave_peterson@pobox.com
+L:     bluesmoke-devel@lists.sourceforge.net
+W:     bluesmoke.sourceforge.net
+S:     Maintained
+
+EDAC-R82600
+P:     Tim Small
+M:     tim@buttersideup.com
+L:     bluesmoke-devel@lists.sourceforge.net
+W:     bluesmoke.sourceforge.net
+S:     Maintained
 
 EEPRO100 NETWORK DRIVER
 P:     Andrey V. Savochkin
@@ -1039,6 +1069,15 @@ M:       khc@pm.waw.pl
 W:     http://www.kernel.org/pub/linux/utils/net/hdlc/
 S:     Maintained
 
+GIGASET ISDN DRIVERS
+P:     Hansjoerg Lipp
+M:     hjlipp@web.de
+P:     Tilman Schmidt
+M:     tilman@imap.cc
+L:     gigaset307x-common@lists.sourceforge.net
+W:     http://gigaset307x.sourceforge.net/
+S:     Maintained
+
 HARDWARE MONITORING
 P:     Jean Delvare
 M:     khali@linux-fr.org
@@ -1421,6 +1460,19 @@ P:       Juanjo Ciarlante
 M:     jjciarla@raiz.uncu.edu.ar
 S:     Maintained
 
+IPATH DRIVER:
+P:     Bryan O'Sullivan
+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
@@ -1520,9 +1572,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
@@ -1744,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
@@ -1835,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
@@ -1855,6 +1906,7 @@ NETWORKING [GENERAL]
 P:     Networking Team
 M:     netdev@vger.kernel.org
 L:     netdev@vger.kernel.org
+W:     http://linux-net.osdl.org/
 S:     Maintained
 
 NETWORKING [IPv4/IPv6]
@@ -2021,14 +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/
-S:     Maintained
-
-PERSONALITY HANDLING
-P:     Christoph Hellwig
-M:     hch@infradead.org
-L:     linux-abi-devel@lists.sourceforge.net
+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
@@ -2081,6 +2131,12 @@ M:       tsbogend@alpha.franken.de
 L:     netdev@vger.kernel.org
 S:     Maintained
 
+PERSONALITY HANDLING
+P:     Christoph Hellwig
+M:     hch@infradead.org
+L:     linux-abi-devel@lists.sourceforge.net
+S:     Maintained
+
 PHRAM MTD DRIVER
 P:     Jörn Engel
 M:     joern@wh.fh-wedel.de
@@ -2203,6 +2259,12 @@ M:       p_gortmaker@yahoo.com
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
+REAL TIME CLOCK (RTC) SUBSYSTEM
+P:     Alessandro Zummo
+M:     a.zummo@towertech.it
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+
 REISERFS FILE SYSTEM
 P:     Hans Reiser
 M:     reiserfs-dev@namesys.com
@@ -2219,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
@@ -3017,13 +3080,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