Merge branch 'pci/huang-d3cold-fixes' into next
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 4 Dec 2012 23:13:03 +0000 (16:13 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 4 Dec 2012 23:13:03 +0000 (16:13 -0700)
* pci/huang-d3cold-fixes:
  PCI/PM: Keep runtime PM enabled for unbound PCI devices

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

Simple merge
Simple merge