diff --git a/[refs] b/[refs] index 247d25a0bbf8..af0294a837dd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 87e753b0065f94314ebdacf6593a172cdd7839c8 +refs/heads/master: 898fee4f6ed52b5b5dd159b221d2ad7ce40ae2dd diff --git a/trunk/drivers/acpi/device_pm.c b/trunk/drivers/acpi/device_pm.c index 2ce07cee0434..61ae99b09f1c 100644 --- a/trunk/drivers/acpi/device_pm.c +++ b/trunk/drivers/acpi/device_pm.c @@ -115,7 +115,7 @@ const char *acpi_power_state_string(int state) case ACPI_STATE_D3_HOT: return "D3hot"; case ACPI_STATE_D3_COLD: - return "D3"; + return "D3cold"; default: return "(unknown)"; }