Merge branch 'pci/huang-d3cold-fixes' into for-linus

* pci/huang-d3cold-fixes:
  PCI/PM: Fix proc config reg access for D3cold and bridge suspending
  PCI/PM: Resume device before shutdown
  PCI/PM: Fix deadlock when unbinding device if parent in D3cold
This commit is contained in:
Bjorn Helgaas 2012-11-05 16:59:53 -07:00
commit 3cba8eedb7
7 changed files with 60 additions and 51 deletions