From 88908f4f400aeb4956dbbaed67dad8fee21617da Mon Sep 17 00:00:00 2001 From: Joe Perches Date: Mon, 26 Oct 2009 16:49:40 -0700 Subject: [PATCH] --- yaml --- r: 167729 b: refs/heads/master c: d6f005a108983292f191a177314c591a95fc2233 h: refs/heads/master i: 167727: e02cb8b70e4579c1f259cbbc815ea0eeb159dad5 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 1a9347bed28a..57f9b4a8b869 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bda2562c34c338c516750b4f6e956c138115cce2 +refs/heads/master: d6f005a108983292f191a177314c591a95fc2233 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index be2124b30693..2c2ca16c4363 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2202,18 +2202,6 @@ F: Documentation/filesystems/caching/ F: fs/fscache/ F: include/linux/fscache*.h -TRACING -M: Steven Rostedt -M: Frederic Weisbecker -M: Ingo Molnar -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 include/trace/ include/linux/trace*.h -F: kernel/trace/ - FUJITSU FR-V (FRV) PORT M: David Howells S: Maintained @@ -5176,6 +5164,20 @@ L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers) S: Maintained F: drivers/char/tpm/ +TRACING +M: Steven Rostedt +M: Frederic Weisbecker +M: Ingo Molnar +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/linux/trace*.h +F: include/trace/ +F: kernel/trace/ + TRIVIAL PATCHES M: Jiri Kosina T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git