From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 26 Mar 2007 21:33:50 +0000 (-0700)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: v2.6.21-rc6~117
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55ab97569f5e64a1febe02485b2d5dd77c208298;p=linux-2.6

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
---

55ab97569f5e64a1febe02485b2d5dd77c208298