Merge branch 'for-linus' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 26 Nov 2012 20:00:57 +0000 (13:00 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 26 Nov 2012 20:00:57 +0000 (13:00 -0700)
commitd3fe3988fb24e5ed13b2243b789a652882d3b26c
tree1257424a712583bf474cb0831621a47e73dfc3de
parent7db78a9c864d1baf916d849febef31e274cfcb1f
parentff8e59bc4ec3f31789a47dce9b6fe44bd7bc5fcc
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
drivers/pci/pci-driver.c
drivers/pci/pci-sysfs.c
drivers/pci/pci.c
drivers/pci/pci.h