tree 305f7d9f074b80415f140ffed598f71055d63a22
parent 2c1f56acb2ddf3aa273b14ebd48d61b930777e52
parent 87683e22c646e563061a91f4a0106e6913acebf8
author Bjorn Helgaas <bhelgaas@google.com> 1347316530 -0600
committer Bjorn Helgaas <bhelgaas@google.com> 1347316530 -0600

Merge branch 'pci/oliver-pciehp-resume' into next

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