diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-19 14:41:22 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-19 14:41:22 +0200 |
| commit | 2ba87ea132a7364dbeb71126f3d7b8ec8e59d0e9 (patch) | |
| tree | 76952814bd533085a1cb8ba4adfc3ecf81f60da7 | |
| parent | 639bb92a1ff1aab2c455acd183f973c022275798 (diff) | |
| parent | fefa8ff810c5ab4c4206aed9d159c4d6fe8d4f1c (diff) | |
| parent | dc559aabe2d4d1c176a9b05a96519897a8197177 (diff) | |
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