From 298c04cab8a183c76802065441debd318834a1f6 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Tue, 22 Jan 2013 12:56:26 +0100
Subject: [PATCH] --- yaml --- r: 350935 b: refs/heads/master c:
 898fee4f6ed52b5b5dd159b221d2ad7ce40ae2dd h: refs/heads/master i:   350933:
 f43afc90338bb2d8bc3ebd99b6485877a93b5e02   350931:
 6171ea831e948ee16bde462f4fd6f276a4e9ecb0   350927:
 06f81bc0ea36c14a54470716ed9f3b36bf9c79f8 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/acpi/device_pm.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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)";
 	}