diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 13:55:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-20 13:55:04 -0400 |
| commit | 737b0fbf448306975267509e6c6a074885ddb43c (patch) | |
| tree | dddcbb606a0bd41037580fd1362d61ca72421a9f /MAINTAINERS | |
| parent | c110a2bd82676a8f124cf4dfc39339fd366f0e59 (diff) | |
| parent | c1f69db782595a9869395dad4b60d331906c22ef (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: correct mailing list address
PCI: Correct last two HP entries in the bfsort whitelist
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index dc94fc5cb25b..461c2790e29e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3143,7 +3143,7 @@ PCI ERROR RECOVERY | |||
| 3143 | P: Linas Vepstas | 3143 | P: Linas Vepstas |
| 3144 | M: linas@austin.ibm.com | 3144 | M: linas@austin.ibm.com |
| 3145 | L: linux-kernel@vger.kernel.org | 3145 | L: linux-kernel@vger.kernel.org |
| 3146 | L: linux-pci@atrey.karlin.mff.cuni.cz | 3146 | L: linux-pci@vger.kernel.org |
| 3147 | S: Supported | 3147 | S: Supported |
| 3148 | 3148 | ||
| 3149 | PCI SUBSYSTEM | 3149 | PCI SUBSYSTEM |