Merge branch 'pci/ptm'
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 15 Dec 2020 21:11:09 +0000 (15:11 -0600)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 15 Dec 2020 21:11:09 +0000 (15:11 -0600)
commit72b3a644bbe994add91249676d77c279b1d92376
treec63ecbd900f7254d4e0c6adbe7e65a8d6946ede5
parentff163da95b0ce29ce5ce597a1e98b3e528e57750
parenta697f072f5da8d75467be81bec918eb479405615
Merge branch 'pci/ptm'

- Save/restore Precision Time Measurement Capability for suspend/resume
  (David E. Box)

- Disable PTM during suspend to save power (David E. Box)

* pci/ptm:
  PCI: Disable PTM during suspend to save power
  PCI/PTM: Save/restore Precision Time Measurement Capability for suspend/resume
drivers/pci/pci.c
drivers/pci/pci.h