From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 10 Apr 2015 10:01:59 +0000 (+0200)
Subject: Merge back earlier suspend/hibernate material for v4.1.
X-Git-Tag: v4.1-rc1~131^2~2^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=be770021011f00bd6220c87876292053221ca5f1;p=users%2Fjedix%2Flinux-maple.git

Merge back earlier suspend/hibernate material for v4.1.
---

be770021011f00bd6220c87876292053221ca5f1