Merge back 'pm-sleep' material for 3.19-rc1.
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 18 Nov 2014 00:23:34 +0000 (01:23 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 18 Nov 2014 00:23:34 +0000 (01:23 +0100)

Trivial merge