[git pull] PCI fixes

Jesse Barnes
2011-11-23T22:42:57Z

[-- Attachment #1: Type: text/plain, Size: 1537 bytes --]

The following changes since commit
839d8810747bbf39e0a5a7f223b67bffa7945f8d:

Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging (2011-10-30 15:54:59 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci for-linus

Nothing too exciting this time, mostly some minor fixes for things
normal people don't really hit. Happy Thanksgiving.

Bjorn Helgaas (1):
PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs

Joerg Roedel (2):
PCI: Fix compile errors with PCI_ATS and !PCI_IOV
PCI: Let PCI_PRI depend on PCI

Kenji Kaneshige (2):
PCI: pciehp: wait 1000 ms before Link Training check
PCI: pciehp: wait 100 ms after Link Training check

Rafael J. Wysocki (1):
PCI / ACPI: Make acpiphp ignore root bridges using PCIe native hotplug

Yinghai Lu (1):
PCI: pciehp: Retrieve link speed after link is trained

drivers/pci/Kconfig | 1 +
drivers/pci/hotplug/acpiphp_glue.c | 29 ++++++++++++++++++++++++-----
drivers/pci/hotplug/pciehp_ctrl.c | 3 ---
drivers/pci/hotplug/pciehp_hpc.c | 27 ++++++++++++++++++---------
drivers/pci/hotplug/shpchp_core.c | 4 ++--
drivers/pci/hotplug/shpchp_hpc.c | 4 ++--
include/linux/pci-ats.h | 6 +++---
include/linux/pci.h | 2 +-
8 files changed, 51 insertions(+), 25 deletions(-)

--
Jesse Barnes, Intel Open Source Technology Center

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]