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)
commitcbcd085da2f99a8b36a07256dd7d1aae38b1d80f
treef6ff7373eba2ae700a49a855707a7c63552190ef
parent9e50bc14a7f58b5d8a55973b2d69355852ae2dae
parent0c5ff0ef80c2561ef20721299ecfc39c5a42f694
Merge branch 'pm-sleep' into acpi-battery