From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Mon, 30 Dec 2013 00:53:57 +0000 (+0100)
Subject: Merge back earlier 'pm-sleep' material.
X-Git-Tag: v3.14-rc1~107^2~6^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=fbd22402164e687fd1be9a1372ee4f6b9373c860;p=linux.git

Merge back earlier 'pm-sleep' material.
---

fbd22402164e687fd1be9a1372ee4f6b9373c860