summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-13 23:39:06 +0300
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-13 23:39:06 +0300
commitc7fb90dfbef49b03e6f3fd6a32338e59cbcf34ee (patch)
treeabf9acf8d97ce29e42c7539d902070745a66e535 /drivers
parent69bf75e9ae2d02304fe42b32daaa8d173705afc6 (diff)
parentd4d4eda23794c701442e55129dd4f8f2fefd5e4d (diff)
parent5177a94aea6fbffc897aaee29c7cde57f951b541 (diff)
parent04a695edcaee386207e5a43a41bafa8388bf3bf4 (diff)
parent59d84ca8c46a93ad62f9129458e897e7fe5075de (diff)
parent79b56ab8c3f64d05700bd3bcad79aa726931c150 (diff)
downloadlinux-c7fb90dfbef49b03e6f3fd6a32338e59cbcf34ee.tar.xz
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