Merge branch 'pci/oliver-pciehp-resume' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 10 Sep 2012 22:35:30 +0000 (16:35 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 10 Sep 2012 22:35:30 +0000 (16:35 -0600)
commit5aaa71cf12f998e7073e36e8efa45d45656d9ace
tree305f7d9f074b80415f140ffed598f71055d63a22
parent2c1f56acb2ddf3aa273b14ebd48d61b930777e52
parent87683e22c646e563061a91f4a0106e6913acebf8
Merge branch 'pci/oliver-pciehp-resume' into next

* pci/oliver-pciehp-resume:
  PCI: pciehp: Always implement resume, regardless of pciehp_force param