From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 14 Mar 2019 09:51:51 +0000 (+0100)
Subject: Merge branches 'pm-cpuidle' and 'pm-cpufreq'
X-Git-Tag: v5.1-rc1~29^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4650b2792944e4cee86df6b016f2b7338a0b33f1;p=thirdparty%2Fkernel%2Flinux.git

Merge branches 'pm-cpuidle' and 'pm-cpufreq'

* pm-cpuidle:
  cpuidle: governor: Add new governors to cpuidle_governors again
  cpuidle: menu: Avoid overflows when computing variance

* pm-cpufreq:
  cpufreq: intel_pstate: Fix up iowait_boost computation
  cpufreq: pxa2xx: remove incorrect __init annotation
  cpufreq: Improve kerneldoc comments for cpufreq_cpu_get/put()
---

4650b2792944e4cee86df6b016f2b7338a0b33f1