diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-04 10:20:17 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2019-12-04 10:20:17 +0100 |
| commit | 1e4230f56dac141eb149ebec01f41b6fad27e503 (patch) | |
| tree | 5ca4fcac9a70bfe871a323a2c0a5ee9c6272fd9d /arch | |
| parent | 36a8015f89e40f7c9c91cc7e6d028fa288dad27b (diff) | |
| parent | 024aa8732acb7d2503eae43c3fe3504d0a8646d0 (diff) | |
| parent | 4d30d4a0441dac4452fcc188cd21536bedaec5df (diff) | |
| parent | cde10f856a7de191a773d880bb524ea15084e1cc (diff) | |
| parent | e1e047ace8cef6d143f38c7d769753f133becbe6 (diff) | |
| parent | 2a0efc77735b48c42aedbe99df1f8f91aa402f57 (diff) | |
Merge branches 'pm-sleep', 'pm-cpuidle', 'pm-cpufreq', 'pm-devfreq' and 'pm-avs'
* pm-sleep:
ACPI: PM: s2idle: Rework ACPI events synchronization
ACPI: EC: Rework flushing of pending work
* pm-cpuidle:
cpuidle: minor Kconfig help text fixes
cpuidle: Drop disabled field from struct cpuidle_state
cpuidle: Fix Kconfig indentation
* pm-cpufreq:
cpufreq: Fix Kconfig indentation
* pm-devfreq:
PM / devfreq: Add missing locking while setting suspend_freq
* pm-avs:
power: avs: Fix Kconfig indentation