diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-12-15 15:25:37 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-12-15 15:25:37 +0100 |
| commit | 4c5744a0c4fcb878e1500e77d53722197c0a3f7c (patch) | |
| tree | 4d0154607e8c308234cda5403d2b61cf060f5a59 /init/version.c | |
| parent | e1f1320fc0a090e7019ad8ec7d81f8a18a5080eb (diff) | |
| parent | 7a25759eaa04b8c0ecb3db134922d6641ab2e6d1 (diff) | |
| parent | 1080399542075bb0e9d46ea80418d76784d1ece8 (diff) | |
| download | linux-4c5744a0c4fcb878e1500e77d53722197c0a3f7c.tar.bz2 | |
Merge branches 'pm-cpuidle' and 'pm-em'
* pm-cpuidle:
cpuidle: Select polling interval based on a c-state with a longer target residency
cpuidle: psci: Enable suspend-to-idle for PSCI OSI mode
PM: domains: Enable dev_pm_genpd_suspend|resume() for suspend-to-idle
PM: domains: Rename pm_genpd_syscore_poweroff|poweron()
* pm-em:
PM / EM: Micro optimization in em_cpu_energy
PM: EM: Update Energy Model with new flag indicating power scale
PM: EM: update the comments related to power scale
PM: EM: Clarify abstract scale usage for power values in Energy Model