diff --git a/[refs] b/[refs]
index 8f4f2e3182e3..21cade4476e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b882be4e00e53a44f47ad7eb997cac2938848bf
+refs/heads/master: 4a80b24bb2ec66a5cb7fa5ff8335907f09288200
diff --git a/trunk/Documentation/ABI/testing/debugfs-kmemtrace b/trunk/Documentation/ABI/testing/debugfs-kmemtrace
index a5ff9a64c9ee..5e6a92a02d85 100644
--- a/trunk/Documentation/ABI/testing/debugfs-kmemtrace
+++ b/trunk/Documentation/ABI/testing/debugfs-kmemtrace
@@ -63,7 +63,7 @@ Adding new data to the packet (features) is done at the end of the mandatory
 data:
 	Feature size	(2 byte)
 	Feature ID	(1 byte)
-	Feature data	(Feature size - 4 bytes)
+	Feature data	(Feature size - 3 bytes)
 
 
 Users:
diff --git a/trunk/Documentation/vm/kmemtrace.txt b/trunk/Documentation/vm/kmemtrace.txt
index 75360b142ba4..f656cac3558c 100644
--- a/trunk/Documentation/vm/kmemtrace.txt
+++ b/trunk/Documentation/vm/kmemtrace.txt
@@ -61,7 +61,7 @@ III. Quick usage guide
 ======================
 
 1) Get a kernel that supports kmemtrace and build it accordingly (i.e. enable
-CONFIG_KMEMTRACE and CONFIG_DEFAULT_ENABLED).
+CONFIG_KMEMTRACE and CONFIG_KMEMTRACE_DEFAULT_ENABLED).
 
 2) Get the userspace tool and build it:
 $ git-clone git://repo.or.cz/kmemtrace-user.git		# current repository