Merge back earlier 'pm-sleep' material.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 30 Dec 2013 00:53:57 +0000 (01:53 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 30 Dec 2013 00:53:57 +0000 (01:53 +0100)

Trivial merge