diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-01-02 10:16:32 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2021-01-02 10:16:32 +0100 |
| commit | 89ecf09e0b93de54415de45be241649ec1b162de (patch) | |
| tree | 45a5733c04fc8ee2e1bfd6464185a66e187f8806 | |
| parent | 977a3b0f6e40514ccdc959cc82b1eb96b636941a (diff) | |
| parent | be1283454b61a1f3b089f1a74b73e20532262e32 (diff) | |
| parent | 9cf93f056f783f986c19f40d5304d1bcffa0fc0d (diff) | |
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
* pm-cpufreq:
cpufreq: intel_pstate: Fix fast-switch fallback path
* pm-cpuidle:
intel_idle: add SnowRidge C-state table
MAINTAINERS: include governors into CPU IDLE TIME MANAGEMENT FRAMEWORK