Merge back earlier suspend/hibernate material for v4.1.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 10 Apr 2015 10:01:59 +0000 (12:01 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 10 Apr 2015 10:01:59 +0000 (12:01 +0200)

Trivial merge