From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 4 Feb 2008 15:42:16 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
X-Git-Tag: v2.6.25-rc1~1067
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=7cf7669143db087e5cb36d1e07143938ff467147;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: fix 4x section mismatch warnings
  PCI: fix section mismatch warnings referring to pci_do_scan_bus
  pci: pci_enable_device_bars() fix for lpfc driver
  Revert "PCI: PCIE ASPM support"
---

7cf7669143db087e5cb36d1e07143938ff467147