tree 681f62b7563cebb9c45f3da9c1107807a8f5afad
parent 04a395233089ed160ef87a6c2155e5dedc6f7d15
parent bf5b4ba3d9f37d41d940a92822b534561abf4f4c
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1174944830 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1174944830 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  PCI: Fix warning message in PCIE port driver
  PCI: Stop unhiding the SMBus on Toshiba laptops
  PCI: Fix up PCI power management doc
  pci: set pci=bfsort for PowerEdge R900