summaryrefslogtreecommitdiffstats
path: root/tools/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-13 21:39:06 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-02-13 21:39:06 +0100
commitc7fb90dfbef49b03e6f3fd6a32338e59cbcf34ee (patch)
treeabf9acf8d97ce29e42c7539d902070745a66e535 /tools/power
parentMerge branch 'acpi-ec' (diff)
parentcpufreq: speedstep-smi: enable interrupts when waiting (diff)
parentMerge branch 'cpuidle' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/... (diff)
parentPM / devfreq: event: testing the wrong variable (diff)
parentPM / OPP / clk: Remove unnecessary OOM message (diff)
parentMerge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/len... (diff)
downloadlinux-c7fb90dfbef49b03e6f3fd6a32338e59cbcf34ee.tar.xz
linux-c7fb90dfbef49b03e6f3fd6a32338e59cbcf34ee.zip
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