From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 17 Dec 2011 18:40:51 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=a36bfddd65b58dd8c8364dba919c04922e04f2f5;p=~shefty%2Frdma-dev.git

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: 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
---

a36bfddd65b58dd8c8364dba919c04922e04f2f5