summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-25 00:57:22 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-03-25 00:57:22 +0100
commit33068b61f8c041e67b554ddcb44c25ca748d38f6 (patch)
treedb0190b43e3e09ec5cd158dba94d8bbbba268c38 /include
parent277edbabf6fece057b14fb6db5e3a34e00f42f42 (diff)
parent539a4c4247c2697d291a8fb02c485ccd7cf34f05 (diff)
parentf70ce488c2894cd41ea8489975906adccf82131c (diff)
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
* pm-cpufreq: cpufreq: governor: Always schedule work on the CPU running update cpufreq: Always update current frequency before startig governor cpufreq: Introduce cpufreq_update_current_freq() cpufreq: Introduce cpufreq_start_governor() cpufreq: powernv: Add sysfs attributes to show throttle stats cpufreq: acpi-cpufreq: make Intel/AMD MSR access, io port access static cpufreq: powernv: Define per_cpu chip pointer to optimize hot-path cpufreq: acpi-cpufreq: Clean up hot plug notifier callback intel_pstate: Do not call wrmsrl_on_cpu() with disabled interrupts cpufreq: Make cpufreq_quick_get() safe to call * pm-cpuidle: intel_idle: Support for Intel Xeon Phi Processor x200 Product Family intel_idle: prevent SKL-H boot failure when C8+C9+C10 enabled cpuidle: menu: Fall back to polling if next timer event is near cpuidle: menu: use high confidence factors only when considering polling