diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-29 16:19:39 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-29 16:19:39 +0300 |
| commit | d29809b8eb12d291d7b507fdaaa5e44707641685 (patch) | |
| tree | a63b3feb1586911187df7b6ef60d692f7a2fa08e /include | |
| parent | 559ed40752dc63e68f9b9ad301b20e6a3fe5cf21 (diff) | |
| parent | 71b65445f0ed04c2afe3660f829779fddb2890c1 (diff) | |
Merge branches 'pm-cpufreq' and 'acpi-pm'
* pm-cpufreq:
cpufreq: Avoid attempts to create duplicate symbolic links
intel_pstate: Add get_scaling cpu_defaults param to Knights Landing
* acpi-pm:
ACPI / PM: Use target_state to set the device power state
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions