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

[linux-3.10.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 270e28c0506aa4dba9af46c57f853a9ddea4c92c..07420161e669054211c639cedf55c56127ccb943 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
@@ -1994,6 +1987,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