From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 22 Jan 2007 21:14:37 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: v2.6.20-rc6~49
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=46fd906131bfae831b56a1e64dd94956626fc07c;p=~emulex%2Finfiniband.git

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 pci-driver kernel-doc
  PCI: rework Documentation/pci.txt
  PCI: Unhide the SMBus on the Asus P4P800-X
---

46fd906131bfae831b56a1e64dd94956626fc07c