Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Jul 2008 23:59:43 +0000 (16:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 7 Jul 2008 23:59:43 +0000 (16:59 -0700)
commit7b51ba38d9baca207152d1c97ec793cfb673a6cd
tree581d9340f2bca78e755469611c224b050d439f59
parent4f81c5350b44bcc501ab6f8a089b16d064b4d2f6
parent739db07f82767e7634176d18af2acbe77b11fd42
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:
  Revert "PCI: Correct last two HP entries in the bfsort whitelist"