diff --git a/[refs] b/[refs]
index 5fd9cc4ac07d..a17d0e526fc9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1db457ce6e2f63cb01022f58c0c023838958bd1
+refs/heads/master: bc5c6c043d8381676339fb3da59cc4cc5921d368
diff --git a/trunk/Documentation/trace/ftrace.txt b/trunk/Documentation/trace/ftrace.txt
index fd9a3e693813..5ad2ded8aa63 100644
--- a/trunk/Documentation/trace/ftrace.txt
+++ b/trunk/Documentation/trace/ftrace.txt
@@ -179,7 +179,7 @@ Here is the list of current tracers that may be configured.
 
 	Function call tracer to trace all kernel functions.
 
-  "function_graph_tracer"
+  "function_graph"
 
 	Similar to the function tracer except that the
 	function tracer probes the functions on their entry