diff --git a/[refs] b/[refs]
index a1fcb3f6a325..a99823c5f207 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 00d6296145c6b671a9886e380efc24f2731d856a
+refs/heads/master: 0835ab53eab5bbeebe1c135e92fb0c4d483dde17
diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig
index dcef8b55011a..f698a5af5007 100644
--- a/trunk/init/Kconfig
+++ b/trunk/init/Kconfig
@@ -394,6 +394,14 @@ config CGROUP_MEM_CONT
 	  Provides a memory controller that manages both page cache and
 	  RSS memory.
 
+	  Note that setting this option increases fixed memory overhead
+	  associated with each page of memory in the system by 4/8 bytes
+	  and also increases cache misses because struct page on many 64bit
+	  systems will not fit into a single cache line anymore.
+
+	  Only enable when you're ok with these trade offs and really
+	  sure you need the memory controller.
+
 config PROC_PID_CPUSET
 	bool "Include legacy /proc/<pid>/cpuset file"
 	depends on CPUSETS