From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 31 Dec 2013 21:09:28 +0000 (+0100)
Subject: Merge branches 'pm-cpufreq' and 'pm-cpuidle'
X-Git-Tag: v3.13-rc7~2^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0a405fe97fd54d5e89560c6d0f4070ff43862a49;p=karo-tx-linux.git

Merge branches 'pm-cpufreq' and 'pm-cpuidle'

* pm-cpufreq:
  intel_pstate: Fail initialization if P-state information is missing
  cpufreq: preserve user_policy across suspend/resume
  cpufreq: Clean up after a failing light-weight initialization

* pm-cpuidle:
  ARM/cpuidle: remove __init tag from Calxeda cpuidle probe function
---

0a405fe97fd54d5e89560c6d0f4070ff43862a49