From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 29 Nov 2007 00:02:50 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=34f2c1c35ff014a5d145971e41caa940cd62d563;p=linux-beck.git

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
---

34f2c1c35ff014a5d145971e41caa940cd62d563