Merge branch 'pci/huang-d3cold-fixes' into for-linus
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 5 Nov 2012 23:59:53 +0000 (16:59 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 5 Nov 2012 23:59:53 +0000 (16:59 -0700)
* 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


Trivial merge