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)
commit737b0fbf448306975267509e6c6a074885ddb43c
treedddcbb606a0bd41037580fd1362d61ca72421a9f
parentc110a2bd82676a8f124cf4dfc39339fd366f0e59
parentc1f69db782595a9869395dad4b60d331906c22ef
Merge branch 'for-linus' of git://git./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
MAINTAINERS