From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 28 Apr 2017 15:34:24 +0000 (-0500)
Subject: Merge branch 'pci/pm' into next
X-Git-Tag: v4.12-rc1~65^2~4
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=acc886ec934980a45ae8962dbe88e221a40c77a2;p=linux.git

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

acc886ec934980a45ae8962dbe88e221a40c77a2