diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-29 15:19:39 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-07-29 15:19:39 +0200 |
| commit | d29809b8eb12d291d7b507fdaaa5e44707641685 (patch) | |
| tree | a63b3feb1586911187df7b6ef60d692f7a2fa08e /include/linux | |
| parent | cpufreq: Avoid attempts to create duplicate symbolic links (diff) | |
| parent | ACPI / PM: Use target_state to set the device power state (diff) | |
| download | linux-dev-d29809b8eb12d291d7b507fdaaa5e44707641685.tar.xz linux-dev-d29809b8eb12d291d7b507fdaaa5e44707641685.zip | |
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/linux')
0 files changed, 0 insertions, 0 deletions