Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/pci-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Feb 2008 15:42:16 +0000 (07:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 4 Feb 2008 15:42:16 +0000 (07:42 -0800)
commit7cf7669143db087e5cb36d1e07143938ff467147
tree30bd5643d4f799badeb37a6a7cc47500d4a4eb36
parent9135f1901ee6449dfe338adf6e40e9c2025b8150
parent451124a7cc6c89fcb83d48082c7290f16f652f1c
Merge git://git./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"