From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 23 Nov 2011 22:58:46 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
X-Git-Tag: MMI-PSA29.97-13-9~17971
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=09521577ca7718b6c83f095ca4f0d474b01a8378;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'for-linus' of git://git./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
---

09521577ca7718b6c83f095ca4f0d474b01a8378