tree f6ff7373eba2ae700a49a855707a7c63552190ef
parent 9e50bc14a7f58b5d8a55973b2d69355852ae2dae
parent 0c5ff0ef80c2561ef20721299ecfc39c5a42f694
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1401449993 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1401449993 +0200

Merge branch 'pm-sleep' into acpi-battery