Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 21:14:37 +0000 (13:14 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 21:14:37 +0000 (13:14 -0800)
commit46fd906131bfae831b56a1e64dd94956626fc07c
tree2c3992b6ffe0994498c468c9ef57eaad106969d6
parent39470bf24d93927bb27929b9f0d52ff5d608cfcb
parentae9608af9e300395ec032479621f32688c121141
Merge /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