tree a63b3feb1586911187df7b6ef60d692f7a2fa08e
parent 559ed40752dc63e68f9b9ad301b20e6a3fe5cf21
parent 71b65445f0ed04c2afe3660f829779fddb2890c1
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1438175979 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1438175979 +0200

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