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

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 9b788d77947217dade28bff268a7551d729a17c4..07420161e669054211c639cedf55c56127ccb943 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1987,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