Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/spi-2.6

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 270e28c..71693c5 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -546,13 +546,6 @@ W: http://linuxtv.org
 T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:     Maintained
 
-BUSLOGIC SCSI DRIVER
-P:     Leonard N. Zubkoff
-M:     Leonard N. Zubkoff <lnz@dandelion.com>
-L:     linux-scsi@vger.kernel.org
-W:     http://www.dandelion.com/Linux/
-S:     Maintained
-
 COMMON INTERNET FILE SYSTEM (CIFS)
 P:     Steve French
 M:     sfrench@samba.org
@@ -811,6 +804,7 @@ S:  Maintained
 DOCBOOK FOR DOCUMENTATION
 P:     Martin Waitz
 M:     tali@admingilde.org
+T:     git http://tali.admingilde.org/git/linux-docbook.git
 S:     Maintained
 
 DOUBLETALK DRIVER
@@ -1994,6 +1988,13 @@ M:       hch@infradead.org
 L:     linux-abi-devel@lists.sourceforge.net
 S:     Maintained
 
+PCI ERROR RECOVERY
+P:     Linas Vepstas
+M:     linas@austin.ibm.com
+L:     linux-kernel@vger.kernel.org
+L:     linux-pci@atrey.karlin.mff.cuni.cz
+S:     Supported
+
 PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES)
 P:     Thomas Sailer
 M:     sailer@ife.ee.ethz.ch
@@ -2358,13 +2359,6 @@ P:       Nicolas Pitre
 M:     nico@cam.org
 S:     Maintained
 
-SNA NETWORK LAYER
-P:     Jay Schulist
-M:     jschlst@samba.org
-L:     linux-sna@turbolinux.com
-W:     http://www.linux-sna.org
-S:     Supported
-
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:     Ingo Molnar
 M:     mingo@redhat.com
@@ -2486,7 +2480,7 @@ P:        Paul Mundt
 M:     lethal@linux-sh.org
 P:     Kazumoto Kojima
 M:     kkojima@rr.iij4u.or.jp
-L:     linux-sh@m17n.org
+L:     linuxsh-dev@lists.sourceforge.net
 W:     http://www.linux-sh.org
 W:     http://www.m17n.org/linux-sh/
 W:     http://www.rr.iij4u.or.jp/~kkojima/linux-sh4.html
@@ -2525,6 +2519,19 @@ P:     Romain Lievin
 M:     roms@lpg.ticalc.org
 S:     Maintained
 
+TIPC NETWORK LAYER
+P:     Per Liden
+M:     per.liden@nospam.ericsson.com
+P:     Jon Maloy
+M:     jon.maloy@nospam.ericsson.com
+P:     Allan Stephens
+M:     allan.stephens@nospam.windriver.com
+L:     tipc-discussion@lists.sourceforge.net
+W:     http://tipc.sourceforge.net/
+W:     http://tipc.cslab.ericsson.net/
+T:     git tipc.cslab.ericsson.net:/pub/git/tipc.git
+S:     Maintained
+
 TLAN NETWORK DRIVER
 P:     Samuel Chessman
 M:     chessman@tux.org