Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 29 Nov 2007 00:02:50 +0000 (16:02 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Thu, 29 Nov 2007 00:02:50 +0000 (16:02 -0800)
commit34f2c1c35ff014a5d145971e41caa940cd62d563
tree041f87086c9b2d2db384a791d460f8f985a0ba5e
parentcae2f9c46d69edb1aee565917735d79aba3a3267
parent26e6c66e47fe7f69ef6ddb078e312204a1f17823
Merge git://git./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