From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 13 Feb 2015 20:39:06 +0000 (+0100)
Subject: Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-devfreq', 'pm-opp' and 'pm-tools'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c7fb90dfbef49b03e6f3fd6a32338e59cbcf34ee;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git

Merge branches 'pm-cpufreq', 'pm-cpuidle', 'pm-devfreq', 'pm-opp' and 'pm-tools'

* pm-cpufreq:
  cpufreq: speedstep-smi: enable interrupts when waiting

* pm-cpuidle:
  intel_idle: support additional Broadwell model

* pm-devfreq:
  PM / devfreq: event: testing the wrong variable

* pm-opp:
  PM / OPP / clk: Remove unnecessary OOM message

* pm-tools:
  tools/power turbostat: support additional Broadwell model
  tools/power turbostat: update parameters, documentation
  tools/power turbostat: Skip printing disabled package C-states
---

c7fb90dfbef49b03e6f3fd6a32338e59cbcf34ee