Merge branch 'pci/pm' into next
authorBjorn Helgaas <bhelgaas@google.com>
Fri, 28 Apr 2017 15:34:24 +0000 (10:34 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Fri, 28 Apr 2017 15:34:24 +0000 (10:34 -0500)
commitacc886ec934980a45ae8962dbe88e221a40c77a2
tree96483d89d16002a6eab6adebd850de1047bd293e
parentc6a7a77cc4e62a2d9011f282ba69ffcafa7efdcc
parentea00353f36b64375518662a8ad15e39218a1f324
Merge branch 'pci/pm' into next

* pci/pm:
  PCI: Freeze PME scan before suspending devices
  PCI/PM: Don't sleep at all when d3_delay or d3cold_delay is zero
drivers/pci/pci.c