]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'pci/pm' into next
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 3 Oct 2016 14:43:21 +0000 (09:43 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 3 Oct 2016 14:43:21 +0000 (09:43 -0500)
commit3f4f35678fb83da2f9ef17ddaa7507a45c2f7049
treebf73ab51e0e7a9847e94fbcae1323c83aa81ed7c
parent6c6cba49495c3a254c1bc922afeb69e1431d2c23
parenta0d2a959d3da343554523d26902de1d40a9e5c28
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
drivers/pci/pci-driver.c
drivers/pci/pci.h