]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 19 Jun 2014 12:41:22 +0000 (14:41 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 19 Jun 2014 12:41:22 +0000 (14:41 +0200)
commit41207bcb03358839e5cf00d7d4b85df91f0aeb95
tree76952814bd533085a1cb8ba4adfc3ecf81f60da7
parentbc644b755efcedcfb35bb592a8530b579557b319
parent92e0f8d1670a65c6dd81d302a8c729ee8e7f75df
parent72182d734627040b063cf9164f98fb3fbc30197f
Merge branches 'pm-cpufreq' and 'pm-cpuidle'

* pm-cpufreq:
  cpufreq: unlock when failing cpufreq_update_policy()
  intel_pstate: Correct rounding in busy calculation
  cpufreq: cpufreq-cpu0: fix CPU_THERMAL dependency

* pm-cpuidle:
  cpuidle: mvebu: Fix the name of the states