tree e9573d995bfae0f81ce800433b424bb998f90eca
parent 1f0b63866fc1be700260547be8edf8e6f0af37f2
parent f71495f3f0c5f0801823d1235b271a4a415d3df8
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1400584935 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1400584935 +0200

Merge branch 'pm-sleep' into acpi-pm