Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Dec 2011 18:40:51 +0000 (10:40 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 17 Dec 2011 18:40:51 +0000 (10:40 -0800)
commita36bfddd65b58dd8c8364dba919c04922e04f2f5
tree6adfdaa4747377806d8e13256856de0699ba6cbe
parent384703b8e6cd4c8ef08512e596024e028c91c339
parentb51306c63449d7f06ffa689036ba49eb46e898b5
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: Set device power state to PCI_D0 for device without native PM support
  PCI hotplug: Always allow acpiphp to handle non-PCIe bridges
  PCI: fix ats compile failure
  PCI: defer enablement of SRIOV BARS