diff --git a/[refs] b/[refs]
index 3f2459a5aeaa..48593fc2b1de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b36461da2a0389149d7f88f3cbc05a30d1db9faa
+refs/heads/master: 40d9d82c8ab8c4e2373a23a1e31dc8d84c53aa01
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 8dca9d89c6c1..1505129ec5a0 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -2118,13 +2118,16 @@ F:	Documentation/filesystems/caching/
 F:	fs/fscache/
 F:	include/linux/fscache*.h
 
-FTRACE
+TRACING
 M:	Steven Rostedt <rostedt@goodmis.org>
+M:	Frederic Weisbecker <fweisbec@gmail.com>
+M:	Ingo Molnar <mingo@redhat.com>
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
 S:	Maintained
 F:	Documentation/trace/ftrace.txt
 F:	arch/*/*/*/ftrace.h
 F:	arch/*/kernel/ftrace.c
-F:	include/*/ftrace.h
+F:	include/*/ftrace.h include/trace/ include/linux/trace*.h
 F:	kernel/trace/
 
 FUJITSU FR-V (FRV) PORT