]> 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)
commit7de5c41161d07fce28e50e71dc67072c5991ffc7
tree76952814bd533085a1cb8ba4adfc3ecf81f60da7
parent8d91f07bed92560225c5d9804e53d3da5ba55ee1
parent0b7f9391fe427dd0b74fc39a38f713c8639e7ed7
parentc4cf6fd010f98abac05fe2fd6f74966c197ab465
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