diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-01 21:54:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-02 00:49:02 +0200 |
| commit | 8302294f43250dc337108c51882a6007f2b1e2e0 (patch) | |
| tree | 85acd4440799c46a372df9cad170fa0c21e59096 /MAINTAINERS | |
| parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 (diff) | |
| parent | 2e572895bf3203e881356a4039ab0fa428ed2639 (diff) | |
| download | linux-8302294f43250dc337108c51882a6007f2b1e2e0.tar.gz linux-8302294f43250dc337108c51882a6007f2b1e2e0.tar.bz2 linux-8302294f43250dc337108c51882a6007f2b1e2e0.zip | |
Merge branch 'tracing/core-v2' into tracing-for-linus
Conflicts:
include/linux/slub_def.h
lib/Kconfig.debug
mm/slob.c
mm/slub.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 068f5fb90020..25a17b49cfe1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2642,6 +2642,12 @@ M: jason.wessel@windriver.com L: kgdb-bugreport@lists.sourceforge.net S: Maintained +KMEMTRACE +P: Eduard - Gabriel Munteanu +M: eduard.munteanu@linux360.ro +L: linux-kernel@vger.kernel.org +S: Maintained + KPROBES P: Ananth N Mavinakayanahalli M: ananth@in.ibm.com |