diff --git a/[refs] b/[refs]
index 78879f87a957..22945a239f45 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ba4cc319ab26c56205d4f23724c4748a553c845
+refs/heads/master: 1462a200057df08be12f3719e1f37adbd2c6e4d0
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index d2099f41aa1e..f51ba2fa2662 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -531,13 +531,14 @@ config BOOT_PRINTK_DELAY
 config RCU_TORTURE_TEST
 	tristate "torture tests for RCU"
 	depends on DEBUG_KERNEL
-	depends on m
 	default n
 	help
 	  This option provides a kernel module that runs torture tests
 	  on the RCU infrastructure.  The kernel module may be built
 	  after the fact on the running kernel to be tested, if desired.
 
+	  Say Y here if you want RCU torture tests to start automatically
+	  at boot time (you probably don't).
 	  Say M if you want the RCU torture tests to build as a module.
 	  Say N if you are unsure.