diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-21 14:19:08 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-06-21 14:19:08 +0200 |
| commit | e50f182c9094f95ecfd52a7f33e7e7320e85eb49 (patch) | |
| tree | 3e850d1c6cb28394a259934677044b23a8dded6d /drivers | |
| parent | 8195a655e5ce09550aff81b2573d9b015d520cb9 (diff) | |
| parent | a09c591306881dfb04387c6ee7b7e2e4683fa531 (diff) | |
| parent | a507a3065c09d69677c502905e597750da3a9815 (diff) | |
| download | linux-e50f182c9094f95ecfd52a7f33e7e7320e85eb49.tar.bz2 | |
Merge branches 'acpi-soc' and 'acpi-processor'
These are a stable-candidate suspend/resume fix of the ACPI driver for
Intel SoCs (LPSS) and an inline stub fix for the ACPI processor driver.
* acpi-soc:
ACPI / LPSS: Avoid PM quirks on suspend and resume from S3
* acpi-processor:
ACPI / processor: Finish making acpi_processor_ppc_has_changed() void