tree 041f87086c9b2d2db384a791d460f8f985a0ba5e
parent cae2f9c46d69edb1aee565917735d79aba3a3267
parent 26e6c66e47fe7f69ef6ddb078e312204a1f17823
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1196294570 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1196294570 -0800

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

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6:
  pci hotplug: kernel-doc fixes
  pci-aer: fix kernel-doc mistakes
  PCI: drivers/pci/pci-sysfs.c: Add missing pci_dev_put
  PCI: pcie portdriver: initialize returned value