]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-cpufreq' and 'acpi-pm'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 29 Jul 2015 13:19:39 +0000 (15:19 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 29 Jul 2015 13:19:39 +0000 (15:19 +0200)
commitcd3d999727966d4277d923449a3544bc63eaa6b5
treea63b3feb1586911187df7b6ef60d692f7a2fa08e
parent60009293cdfb8e54d15b715597d45049be329d4b
parentbb9e1a44ec53d7bd75e30b7402ad94c8788ff21a
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