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)
commitedb1daab8e91338b7e2a6c41faec695891ccda35
tree2f5ce32e53fee349e7f0ffb384a5d952a0a94f2f
parentbe5cd530bd23ef3e00dcb4998e151de9fdd1a104
parent967577b062417b4e4b8e27b711220f4124f5153a
Merge branch 'pci/huang-d3cold-fixes' into next

* pci/huang-d3cold-fixes:
  PCI/PM: Keep runtime PM enabled for unbound PCI devices
drivers/pci/pci-driver.c
drivers/pci/pci.c