summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-08 21:46:56 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-04-08 21:46:56 +0200
commit73659be769a4f0ac26a6b3fc6699754adba36485 (patch)
treebbd0ce89528957005c56d6066a79d25b2ccda581 /arch/x86
parentMerge branches 'pm-cpufreq', 'pm-cpuidle' and 'acpi-cppc' (diff)
parentPM / wakeirq: fix wakeirq setting after wakup re-configuration from sysfs (diff)
parentpowercap: intel_rapl: Add missing Haswell model (diff)
parenttools/power turbostat: work around RC6 counter wrap (diff)
downloadlinux-73659be769a4f0ac26a6b3fc6699754adba36485.tar.xz
linux-73659be769a4f0ac26a6b3fc6699754adba36485.zip
Merge branches 'pm-core', 'powercap' and 'pm-tools'
* pm-core: PM / wakeirq: fix wakeirq setting after wakup re-configuration from sysfs PM / runtime: Document steps for device removal * powercap: powercap: intel_rapl: Add missing Haswell model * pm-tools: tools/power turbostat: work around RC6 counter wrap tools/power turbostat: initial KBL support tools/power turbostat: initial SKX support tools/power turbostat: decode BXT TSC frequency via CPUID tools/power turbostat: initial BXT support tools/power turbostat: print IRTL MSRs tools/power turbostat: SGX state should print only if --debug