www.infradead.org Git - users/willy/linux.git/commitdiff

author	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 23 Nov 2011 22:58:46 +0000 (14:58 -0800)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 23 Nov 2011 22:58:46 +0000 (14:58 -0800)

* '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

		1	2
drivers/pci/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history

Simple merge