diff --git a/[refs] b/[refs]
index 07e27cd8e26e..f78f34930eb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8fd88d159031bd238dad1d7186a2030b9f9349de
+refs/heads/master: 0dcf8fe5fe5d7279f1c479fa82f1f1ca6f22e814
diff --git a/trunk/Documentation/tracepoints.txt b/trunk/Documentation/tracepoints.txt
index 93cd90e89cc1..3a1c74384ffb 100644
--- a/trunk/Documentation/tracepoints.txt
+++ b/trunk/Documentation/tracepoints.txt
@@ -71,7 +71,7 @@ Connecting a function (probe) to a tracepoint is done by providing a probe
 (function to call) for the specific tracepoint through
 register_trace_subsys_eventname().  Removing a probe is done through
 unregister_trace_subsys_eventname(); it will remove the probe.
-marker_synchronize_unregister() must be called before the end of the module exit
+tracepoint_synchronize_unregister() must be called before the end of the module exit
 function to make sure there is no caller left using the probe. This, and the
 fact that preemption is disabled around the probe call, make sure that probe
 removal and module unload are safe. See the "Probe example" section below for a