diff --git a/[refs] b/[refs]
index c3d1ff52be7e..ea7803b14ba1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b762450e84e20a179ee5993b065caaad99a65fbf
+refs/heads/master: 5c31f2738ab124ebc1f8948a5fc17dd7a08ed1ec
diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig
index fc311a4673a2..857b4fa09124 100644
--- a/trunk/kernel/power/Kconfig
+++ b/trunk/kernel/power/Kconfig
@@ -38,13 +38,22 @@ config PM_DEBUG
 
 config PM_TRACE
 	bool "Suspend/resume event tracing"
-	depends on PM && PM_DEBUG && X86_32
-	default y
+	depends on PM && PM_DEBUG && X86_32 && EXPERIMENTAL
+	default n
 	---help---
 	This enables some cheesy code to save the last PM event point in the
 	RTC across reboots, so that you can debug a machine that just hangs
 	during suspend (or more commonly, during resume).
 
+	To use this debugging feature you should attempt to suspend the machine,
+	then reboot it, then run
+
+		dmesg -s 1000000 | grep 'hash matches'
+
+	CAUTION: this option will cause your machine's real-time clock to be
+	set to an invalid time after a resume.
+
+
 config SOFTWARE_SUSPEND
 	bool "Software Suspend"
 	depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP)