Merge branches 'pm-cpuidle' and 'pm-cpufreq'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 14 Mar 2019 09:51:51 +0000 (10:51 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 14 Mar 2019 09:51:51 +0000 (10:51 +0100)
commit4650b2792944e4cee86df6b016f2b7338a0b33f1
tree06410b514413dedd29919228b315a425bab2dd0a
parente6035258dbf9804b8e22878d3932e418c8875963
parent22782b3f9bb8ae21c710e2880db21bc729771e92
parent8e3b403954507eb74ad241dc3750443ccc9ee40a
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()