tree 2c3992b6ffe0994498c468c9ef57eaad106969d6
parent 39470bf24d93927bb27929b9f0d52ff5d608cfcb
parent ae9608af9e300395ec032479621f32688c121141
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1169500477 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1169500477 -0800

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