Merge branch 'pm-sleep' into acpi-battery
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 May 2014 11:39:53 +0000 (13:39 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 30 May 2014 11:39:53 +0000 (13:39 +0200)

Trivial merge