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

diff --cc drivers/pci/pci.c
index 6cdd7e6,71dd5d7..b9fecc2
--- 1/drivers/pci/pci.c
--- 2/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -1558,9 -1564,9 +1558,10 @@@ int pci_save_state(struct pci_dev *dev
                return i;
  
        pci_save_ltr_state(dev);
 +      pci_save_aspm_l1ss_state(dev);
        pci_save_dpc_state(dev);
        pci_save_aer_state(dev);
+       pci_save_ptm_state(dev);
        return pci_save_vc_state(dev);
  }
  EXPORT_SYMBOL(pci_save_state);

diff --cc drivers/pci/pci.h
Simple merge