From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 5 Mar 2008 00:37:10 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: v2.6.25-rc4~6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=12f981f9028da2402c236544c78b8378a278f830;p=~emulex%2Finfiniband.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: pciehp: fix error code path in hpc_power_off_slot
  PCI: Add DECLARE_PCI_DEVICE_TABLE macro
  PCI: fix up error messages for pci_bus registering
  PCI: fix section mismatch warning in pci_scan_child_bus
  PCI: consolidate duplicated MSI enable functions
  PCI: use dev_printk in quirk messages
---

12f981f9028da2402c236544c78b8378a278f830