From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 21 Apr 2014 22:10:17 +0000 (+0200)
Subject: Merge branches 'pm-sleep', 'pm-cpuidle' and 'pm-cpufreq'
X-Git-Tag: v3.15-rc3~11^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e38ed294298089362a224a3f601efe6a49d1a763;p=linux.git

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

* pm-sleep:
  PM / suspend: Make cpuidle work in the "freeze" state

* pm-cpuidle:
  intel_idle: fix IVT idle state table setting

* pm-cpufreq:
  cpufreq: highbank: fix ARM_HIGHBANK_CPUFREQ dependency warning
  cpufreq: ppc: Fix integer overflow in expression
  cpufreq, powernv: Fix build failure on UP
  cpufreq: unicore32: replace IS_ERR and PTR_ERR with PTR_ERR_OR_ZERO
---

e38ed294298089362a224a3f601efe6a49d1a763