diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-30 16:30:14 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2020-10-30 16:30:14 +0100 |
| commit | dea47cf45a7f9bb94684830c47d4b259d5f8d6af (patch) | |
| tree | 24786d276b7b34fa379ba40924e64d3915e00b0f /.gitattributes | |
| parent | d1e7c2996e988866e7ceceb4641a0886885b7889 (diff) | |
| parent | 4e0ba5577dba686f96c1c10ef4166380667fdec7 (diff) | |
| parent | 4d4ce8053bfac9a72b9094c6879119938efaa05d (diff) | |
| download | linux-dea47cf45a7f9bb94684830c47d4b259d5f8d6af.tar.bz2 | |
Merge branches 'pm-cpuidle' and 'pm-sleep'
* pm-cpuidle:
intel_idle: Fix max_cstate for processor models without C-state tables
* pm-sleep:
PM: sleep: fix typo in kernel/power/process.c