diff --git a/[refs] b/[refs]
index 64ad230fa4a3..34c61de57398 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dba58e39ced7af63f2748d12bbb2b4ac83c72391
+refs/heads/master: 42b40b3d55f5782b00b74d9105c3565fbfa5cb80
diff --git a/trunk/Documentation/ftrace.txt b/trunk/Documentation/ftrace.txt
index 22614bef6359..fd9a3e693813 100644
--- a/trunk/Documentation/ftrace.txt
+++ b/trunk/Documentation/ftrace.txt
@@ -100,7 +100,7 @@ of ftrace. Here is a list of some of the key files:
 	that is displayed in one of the above output
 	files.
 
-  trace_max_latency:
+  tracing_max_latency:
 
 	Some of the tracers record the max latency.
 	For example, the time interrupts are disabled.