diff --git a/[refs] b/[refs]
index 197d2514f948..dae8698ea964 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47195d57636604ff6048b0d7aa3e4ed9643f6073
+refs/heads/master: c99c30feadf664ccd8590b96259cb9f3954bd246
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index 01a4d85ee746..e2e73cc17a91 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -173,7 +173,6 @@ config DETECT_SOFTLOCKUP
 config NMI_WATCHDOG
 	bool "Detect Hard Lockups with an NMI Watchdog"
 	depends on DEBUG_KERNEL && PERF_EVENTS && PERF_EVENTS_NMI
-	default y
 	help
 	  Say Y here to enable the kernel to use the NMI as a watchdog
 	  to detect hard lockups.  This is useful when a cpu hangs for no