From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 14 Nov 2014 14:17:32 +0000 (+0100)
Subject: Merge branches 'pm-domains', 'pm-sleep' and 'pm-cpufreq'
X-Git-Tag: v3.18-rc5~18^2
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=31689497d90e589d7050fc7bc850b4b46e632bfc;hp=-c;p=cascardo%2Flinux.git

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

* pm-domains:
  PM / Domains: Fix initial default state of the need_restore flag
  PM / Domains: Change prototype for the attach and detach callbacks

* pm-sleep:
  PM / sleep: Fix entering suspend-to-IDLE if no freeze_oops is set

* pm-cpufreq:
  cpufreq: Avoid crash in resume on SMP without OPP
  cpufreq: cpufreq-dt: Fix arguments in clock failure error message
---

31689497d90e589d7050fc7bc850b4b46e632bfc