tree 1257424a712583bf474cb0831621a47e73dfc3de
parent 7db78a9c864d1baf916d849febef31e274cfcb1f
parent ff8e59bc4ec3f31789a47dce9b6fe44bd7bc5fcc
author Bjorn Helgaas <bhelgaas@google.com> 1353960057 -0700
committer Bjorn Helgaas <bhelgaas@google.com> 1353960057 -0700

Merge branch 'for-linus' into next

* for-linus:
  PCI/portdrv: Don't create hotplug slots unless port supports hotplug
  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