42de5532f4
Conflicts: drivers/acpi/sleep.c Signed-off-by: Len Brown <len.brown@intel.com>
Conflicts: drivers/acpi/sleep.c Signed-off-by: Len Brown <len.brown@intel.com>