diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-10-30 08:47:14 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-10-30 08:47:14 +0100 |
| commit | c4ac6889930d027ffa5cf77e0c202e7e97a4be06 (patch) | |
| tree | 9581ec2f2b73530d3d2a2654c8a9dad0783781e1 /kernel | |
| parent | a1c6ca3c6de763459a6e93b644ec6518c890ba1c (diff) | |
| parent | a7fe5190c03f8137ef08db84a58dd4daf2c4785d (diff) | |
| parent | f174e49e4906d945a0e4de98fbf796de31614f47 (diff) | |
| download | linux-c4ac6889930d027ffa5cf77e0c202e7e97a4be06.tar.gz | |
Merge branches 'pm-cpuidle' and 'pm-cpufreq'
* pm-cpuidle: cpuidle: menu: Remove get_loadavg() from the performance multiplier sched: Factor out nr_iowait and nr_iowait_cpu * pm-cpufreq: cpufreq: remove unused arm_big_little_dt driver cpufreq: drop ARM_BIG_LITTLE_CPUFREQ support for ARM64 cpufreq: intel_pstate: Fix compilation for !CONFIG_ACPI