]> 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)
commit6cecf64c05a5842f385ec31bc7bc606c058b89b4
treea63b3feb1586911187df7b6ef60d692f7a2fa08e
parentcde677851ab0cf6638177004466ee4de8a2e0df1
parentbe999d19b294a38996657fd9228b55cf4125269f
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