Merge back earlier 'pm-sleep' material for v4.4.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 12 Oct 2015 20:30:57 +0000 (22:30 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 12 Oct 2015 20:30:57 +0000 (22:30 +0200)

Trivial merge