Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 17:55:04 +0000 (10:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 20 May 2008 17:55:04 +0000 (10:55 -0700)
* '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

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge