aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS26
1 files changed, 14 insertions, 12 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index be2124b30693..2c2ca16c4363 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2202,18 +2202,6 @@ F: Documentation/filesystems/caching/
2202F: fs/fscache/ 2202F: fs/fscache/
2203F: include/linux/fscache*.h 2203F: include/linux/fscache*.h
2204 2204
2205TRACING
2206M: Steven Rostedt <rostedt@goodmis.org>
2207M: Frederic Weisbecker <fweisbec@gmail.com>
2208M: Ingo Molnar <mingo@redhat.com>
2209T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
2210S: Maintained
2211F: Documentation/trace/ftrace.txt
2212F: arch/*/*/*/ftrace.h
2213F: arch/*/kernel/ftrace.c
2214F: include/*/ftrace.h include/trace/ include/linux/trace*.h
2215F: kernel/trace/
2216
2217FUJITSU FR-V (FRV) PORT 2205FUJITSU FR-V (FRV) PORT
2218M: David Howells <dhowells@redhat.com> 2206M: David Howells <dhowells@redhat.com>
2219S: Maintained 2207S: Maintained
@@ -5176,6 +5164,20 @@ L: tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
5176S: Maintained 5164S: Maintained
5177F: drivers/char/tpm/ 5165F: drivers/char/tpm/
5178 5166
5167TRACING
5168M: Steven Rostedt <rostedt@goodmis.org>
5169M: Frederic Weisbecker <fweisbec@gmail.com>
5170M: Ingo Molnar <mingo@redhat.com>
5171T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git tracing/core
5172S: Maintained
5173F: Documentation/trace/ftrace.txt
5174F: arch/*/*/*/ftrace.h
5175F: arch/*/kernel/ftrace.c
5176F: include/*/ftrace.h
5177F: include/linux/trace*.h
5178F: include/trace/
5179F: kernel/trace/
5180
5179TRIVIAL PATCHES 5181TRIVIAL PATCHES
5180M: Jiri Kosina <trivial@kernel.org> 5182M: Jiri Kosina <trivial@kernel.org>
5181T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git 5183T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git