From 51dbad8ce12654b3f5c946ccff9fe79af0a0d023 Mon Sep 17 00:00:00 2001
From: Yang Hongyang <yanghy@cn.fujitsu.com>
Date: Mon, 25 Jan 2010 11:10:32 +0800
Subject: [PATCH] --- yaml --- r: 180098 b: refs/heads/master c:
 6993b1bb1e62367f500789835a1f747e12259f07 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/Documentation/trace/ftrace.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7aae0502545d..7af874c5e340 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c05d7482777f15e71bb4cb1ba78dee2800dfec6
+refs/heads/master: 6993b1bb1e62367f500789835a1f747e12259f07
diff --git a/trunk/Documentation/trace/ftrace.txt b/trunk/Documentation/trace/ftrace.txt
index 8179692fbb90..bab3040da548 100644
--- a/trunk/Documentation/trace/ftrace.txt
+++ b/trunk/Documentation/trace/ftrace.txt
@@ -1625,7 +1625,7 @@ If I am only interested in sys_nanosleep and hrtimer_interrupt:
 
  # echo sys_nanosleep hrtimer_interrupt \
 		> set_ftrace_filter
- # echo ftrace > current_tracer
+ # echo function > current_tracer
  # echo 1 > tracing_enabled
  # usleep 1
  # echo 0 > tracing_enabled