diff --git a/[refs] b/[refs]
index d9025e5045ab..ec2d0294b388 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce007ea59729d627f62bb5fa8c1a81e25653a0ad
+refs/heads/master: b2d596d8e08099b47e0a75aa4b7f82aae780e851
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
index c6fe99e57a05..8dfa3054f10f 100644
--- a/trunk/arch/i386/Kconfig
+++ b/trunk/arch/i386/Kconfig
@@ -758,10 +758,10 @@ config HOTPLUG_CPU
 	bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
 	depends on SMP && HOTPLUG && EXPERIMENTAL && !X86_VOYAGER
 	---help---
-	  Say Y here to experiment with turning CPUs off and on.  CPUs
-	  can be controlled through /sys/devices/system/cpu.
+	  Say Y here to experiment with turning CPUs off and on, and to
+	  enable suspend on SMP systems. CPUs can be controlled through
+	  /sys/devices/system/cpu.
 
-	  Say N.
 
 endmenu