diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 21:41:42 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 21:41:42 -0500 |
commit | 977127174a7dff52d17faeeb4c4949a54221881f (patch) | |
tree | b05b9d18a1256d7ed97bdfb537213a8d70ccca57 /MAINTAINERS | |
parent | 80c0531514516e43ae118ddf38424e06e5c3cb3c (diff) | |
parent | 93b47684f60cf25e8cefe19a21d94aa0257fdf36 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9b788d779472..07420161e669 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1987,6 +1987,13 @@ M: hch@infradead.org | |||
1987 | L: linux-abi-devel@lists.sourceforge.net | 1987 | L: linux-abi-devel@lists.sourceforge.net |
1988 | S: Maintained | 1988 | S: Maintained |
1989 | 1989 | ||
1990 | PCI ERROR RECOVERY | ||
1991 | P: Linas Vepstas | ||
1992 | M: linas@austin.ibm.com | ||
1993 | L: linux-kernel@vger.kernel.org | ||
1994 | L: linux-pci@atrey.karlin.mff.cuni.cz | ||
1995 | S: Supported | ||
1996 | |||
1990 | PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES) | 1997 | PCI SOUND DRIVERS (ES1370, ES1371 and SONICVIBES) |
1991 | P: Thomas Sailer | 1998 | P: Thomas Sailer |
1992 | M: sailer@ife.ee.ethz.ch | 1999 | M: sailer@ife.ee.ethz.ch |