tree 56bbc5f0ac255f36a0935d3ba4e0a4702203dc66
parent de7badf1adc7cc95269ac4b435da23c169018a3e
parent 4cac2eb158c6da0c761689345c6cc5df788a6292
author Linus Torvalds <torvalds@linux-foundation.org> 1322089126 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1322089126 -0800

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci:
  PCI hotplug: shpchp: don't blindly claim non-AMD 0x7450 device IDs
  PCI: pciehp: wait 100 ms after Link Training check
  PCI: pciehp: wait 1000 ms before Link Training check
  PCI: pciehp: Retrieve link speed after link is trained
  PCI: Let PCI_PRI depend on PCI
  PCI: Fix compile errors with PCI_ATS and !PCI_IOV
  PCI / ACPI: Make acpiphp ignore root bridges using PCIe native hotplug