From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 19 Jun 2014 12:41:22 +0000 (+0200)
Subject: Merge branches 'pm-cpufreq' and 'pm-cpuidle'
X-Git-Tag: v3.16-rc2~14^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2ba87ea132a7364dbeb71126f3d7b8ec8e59d0e9;p=linux.git

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
---

2ba87ea132a7364dbeb71126f3d7b8ec8e59d0e9