]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6c6cba4 a0d2a95)
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)
* 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

1  2 
drivers/pci/pci-driver.c patch | diff1 | diff2 | blob | history
drivers/pci/pci.h patch | diff1 | diff2 | blob | history

diff --cc drivers/pci/pci-driver.c
Simple merge
diff --cc drivers/pci/pci.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.