diff --git a/[refs] b/[refs]
index 54eb3d552593..0726a317662d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1785e85b9c81c67b581b511ee4efac6c81e9edb
+refs/heads/master: 785dcd44b60ec8ede76fed0af54333ab5f3e848c
diff --git a/trunk/mm/Kconfig b/trunk/mm/Kconfig
index 7d3a0054cba1..8283685f3bb3 100644
--- a/trunk/mm/Kconfig
+++ b/trunk/mm/Kconfig
@@ -23,6 +23,16 @@ config DISCONTIGMEM_MANUAL
 	bool "Discontigious Memory"
 	depends on ARCH_DISCONTIGMEM_ENABLE
 	help
+	  This option provides enhanced support for discontiguous
+	  memory systems, over FLATMEM.  These systems have holes
+	  in their physical address spaces, and this option provides
+	  more efficient handling of these holes.  However, the vast
+	  majority of hardware has quite flat address spaces, and
+	  can have degraded performance from extra overhead that
+	  this option imposes.
+
+	  Many NUMA configurations will have this as the only option.
+
 	  If unsure, choose "Flat Memory" over this option.
 
 endchoice