From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Wed, 29 Jul 2015 13:19:39 +0000 (+0200)
Subject: Merge branches 'pm-cpufreq' and 'acpi-pm'
X-Git-Tag: v4.2-rc5~18^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=d29809b8eb12d291d7b507fdaaa5e44707641685;p=users%2Fjedix%2Flinux-maple.git

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
---

d29809b8eb12d291d7b507fdaaa5e44707641685