---

yaml --- r: 350935 b: refs/heads/master c: 898fee4 h: refs/heads/master i: 350933: f43afc9 350931: 6171ea8 350927: 06f81bc v: v3
git-mirror · Jan 22, 2013 · 298c04c · 298c04c
1 parent 97a9c96
commit 298c04c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)";
 	}