Merge branch 'pci/pm' into next
authorBjorn Helgaas <bhelgaas@google.com>
Thu, 7 Sep 2017 18:24:18 +0000 (13:24 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Thu, 7 Sep 2017 18:24:18 +0000 (13:24 -0500)
commitd872694bac212f76ca13fd20a85e5c1bdb53a945
tree2fe88f1eab062c8b5f5fd00656657566078cee26
parent79ab592c700e969d32770dcd1ae39ac64c328812
parentab4b8a47abeefad94cdb6b4c0df6a13f4f6ae4e0
Merge branch 'pci/pm' into next

* pci/pm:
  PCI/PM: Expand description of pci_set_power_state()
drivers/pci/pci.c