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)
* 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

1  2 
drivers/pci/pci-driver.c
drivers/pci/pci-sysfs.c
drivers/pci/pci.c
drivers/pci/pci.h

Simple merge
Simple merge
Simple merge
Simple merge