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)
commit3cba8eedb757590455b03dfeaba15a5b32610339
tree9c035788cf5a2f5fcf897f3fe63c32064bdef255
parent8f0d8163b50e01f398b14bcd4dc039ac5ab18d64
parentb3c32c4f9565f93407921c0d8a4458042eb8998e
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