tree bf73ab51e0e7a9847e94fbcae1323c83aa81ed7c
parent 6c6cba49495c3a254c1bc922afeb69e1431d2c23
parent a0d2a959d3da343554523d26902de1d40a9e5c28
author Bjorn Helgaas <bhelgaas@google.com> 1475505801 -0500
committer Bjorn Helgaas <bhelgaas@google.com> 1475505801 -0500

Merge branch 'pci/pm' into next

* pci/pm:
  PCI: Avoid unnecessary resume after direct-complete
  PCI: Recognize D3cold in pci_update_current_state()
  PCI: Query platform firmware for device power state
  PCI: Afford direct-complete to devices with non-standard PM