diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-01 23:54:10 (GMT) |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-01 23:54:10 (GMT) |
commit | 69f8947b8c4777f58d90cc79da2e124570d9e6f0 (patch) | |
tree | ad153407ce52c9a12659916caa63f10af718c9ef /Documentation | |
parent | 9bb4064ca3bd771f8df88529a3578f9bb5243911 (diff) | |
parent | 3510fac4549201919c565250fdff5cfa63db9e86 (diff) | |
parent | 54c0a8a8f5079de866f99d6f0e782c7857511b10 (diff) | |
download | linux-69f8947b8c4777f58d90cc79da2e124570d9e6f0.tar.xz |
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
* pm-cpufreq:
cpufreq: postfix policy directory with the first CPU in related_cpus
cpufreq: create cpu/cpufreq/policyX directories
cpufreq: remove cpufreq_sysfs_{create|remove}_file()
cpufreq: create cpu/cpufreq at boot time
cpufreq: Use cpumask_copy instead of cpumask_or to copy a mask
cpufreq: ondemand: Drop unnecessary locks from update_sampling_rate()
cpufreq: intel_pstate: Fix intel_pstate powersave min_perf_pct value
cpufreq: intel_pstate: Avoid calculation for max/min
Documentation: kernel_parameters for Intel P state driver
cpufreq: intel_pstate: Use ACPI perf configuration
cpufreq: intel-pstate: Use separate max pstate for scaling
cpufreq: intel_pstate: get P1 from TAR when available
cpufreq: Drop redundant check for inactive policies
cpufreq : powernv: Report Pmax throttling if capped below nominal frequency
cpufreq: imx: update the clock switch flow to support imx6ul
cpufreq: tegra20: remove superfluous CONFIG_PM ifdefs
cpufreq: conservative: remove 'enable' field
cpufreq: integrator: Fix module autoload for OF platform driver
* pm-cpuidle:
cpuidle: mvebu: disable the bind/unbind attributes and use builtin_platform_driver
cpuidle: mvebu: clean up multiple platform drivers