tree 76952814bd533085a1cb8ba4adfc3ecf81f60da7
parent 639bb92a1ff1aab2c455acd183f973c022275798
parent fefa8ff810c5ab4c4206aed9d159c4d6fe8d4f1c
parent dc559aabe2d4d1c176a9b05a96519897a8197177
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1403181682 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1403181682 +0200

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