tree 581d9340f2bca78e755469611c224b050d439f59
parent 4f81c5350b44bcc501ab6f8a089b16d064b4d2f6
parent 739db07f82767e7634176d18af2acbe77b11fd42
author Linus Torvalds <torvalds@linux-foundation.org> 1215475183 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1215475183 -0700

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:
  Revert "PCI: Correct last two HP entries in the bfsort whitelist"