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)
* pci/pm:
  PCI: Freeze PME scan before suspending devices
  PCI/PM: Don't sleep at all when d3_delay or d3cold_delay is zero

1  2 
drivers/pci/pci.c

Simple merge