diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-07-08 10:49:36 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-07-08 10:49:36 +0200 |
| commit | 50e163d43ab123193a7f381528a7485881f730e9 (patch) | |
| tree | 4cef1294084da45698346cc08e80093b927ff734 /drivers/acpi/device_pm.c | |
| parent | 5004efbb3611f0672af6c92823d17100603bcccd (diff) | |
| parent | ad5a449b707b909a91ed59109f421a1b965c6004 (diff) | |
| parent | 9ed411c06dd1cdf6171b992f68c37bc2d66054f9 (diff) | |
| download | linux-50e163d43ab123193a7f381528a7485881f730e9.tar.bz2 | |
Merge branches 'acpi-pm' and 'pm-pci'
* acpi-pm:
ACPI: PM: Make acpi_sleep_state_supported() non-static
ACPI: PM: Allow transitions to D0 to occur in special cases
ACPI: PM: Avoid evaluating _PS3 on transitions from D3hot to D3cold
ACPI / sleep: Switch to use acpi_dev_get_first_match_dev()
ACPI / LPIT: Correct LPIT end address for lpit_process()
* pm-pci:
ACPI: PM: Unexport acpi_device_get_power()
PCI: PM/ACPI: Refresh all stale power state data in pci_pm_complete()
PCI / ACPI: Add _PR0 dependent devices
ACPI / PM: Introduce concept of a _PR0 dependent device
PCI / ACPI: Use cached ACPI device state to get PCI device power state
PCI: Do not poll for PME if the device is in D3cold
PCI: Add missing link delays required by the PCIe spec
PCI: PM: Replace pci_dev_keep_suspended() with two functions
PCI: PM: Avoid resuming devices in D3hot during system suspend