]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
Merge branches 'pm-cpuidle' and 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 30 Oct 2018 07:47:14 +0000 (08:47 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 30 Oct 2018 07:47:14 +0000 (08:47 +0100)
* 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


Trivial merge