Merge branch 'pci/huang-d3cold-fixes' into next

* pci/huang-d3cold-fixes:
  PCI/PM: Keep runtime PM enabled for unbound PCI devices
This commit is contained in:
Bjorn Helgaas 2012-12-04 16:13:03 -07:00
commit edb1daab8e
2 changed files with 42 additions and 27 deletions