diff --git a/[refs] b/[refs]
index 80774e84c713..6d22a3395e4c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43ae34cb4cd650d1eb4460a8253a8e747ba052ac
+refs/heads/master: b642b6d3fad45f659270a9e35df876b38c489082
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index da95e10cfd70..fab32a286371 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -105,6 +105,15 @@ config DETECT_SOFTLOCKUP
 	   can be detected via the NMI-watchdog, on platforms that
 	   support it.)
 
+config SCHED_DEBUG
+	bool "Collect scheduler debugging info"
+	depends on DEBUG_KERNEL && PROC_FS
+	default y
+	help
+	  If you say Y here, the /proc/sched_debug file will be provided
+	  that can help debug the scheduler. The runtime overhead of this
+	  option is minimal.
+
 config SCHEDSTATS
 	bool "Collect scheduler statistics"
 	depends on DEBUG_KERNEL && PROC_FS