diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-14 13:16:16 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-07-14 13:16:16 +0200 |
| commit | a252c258dd0d95884e71f64877313e3f09d63860 (patch) | |
| tree | c9df28c94aa8f6bee3988872a75914db78dbd91d /kernel | |
| parent | ec4b8ddcd3b9836ae06fcf8d7f6442e7d9f0c6e6 (diff) | |
| parent | ab2f7cf141aa6734c4ca7525132d8cc236efee77 (diff) | |
| parent | d4436c0dba8d4d780588179a2e192a867d266a10 (diff) | |
| download | linux-a252c258dd0d95884e71f64877313e3f09d63860.tar.gz linux-a252c258dd0d95884e71f64877313e3f09d63860.tar.bz2 linux-a252c258dd0d95884e71f64877313e3f09d63860.zip | |
Merge branches 'pm-cpufreq-sched' and 'intel_pstate'
* pm-cpufreq-sched:
cpufreq: schedutil: Fix sugov_start() versus sugov_update_shared() race
* intel_pstate:
cpufreq: intel_pstate: Fix ratio setting for min_perf_pct