diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-01 15:54:19 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-01 18:49:02 -0400 |
| commit | 8302294f43250dc337108c51882a6007f2b1e2e0 (patch) | |
| tree | 85acd4440799c46a372df9cad170fa0c21e59096 /MAINTAINERS | |
| parent | 4fe70410d9a219dabb47328effccae7e7f2a6e26 (diff) | |
| parent | 2e572895bf3203e881356a4039ab0fa428ed2639 (diff) | |
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 | |||
| 2642 | L: kgdb-bugreport@lists.sourceforge.net | 2642 | L: kgdb-bugreport@lists.sourceforge.net |
| 2643 | S: Maintained | 2643 | S: Maintained |
| 2644 | 2644 | ||
| 2645 | KMEMTRACE | ||
| 2646 | P: Eduard - Gabriel Munteanu | ||
| 2647 | M: eduard.munteanu@linux360.ro | ||
| 2648 | L: linux-kernel@vger.kernel.org | ||
| 2649 | S: Maintained | ||
| 2650 | |||
| 2645 | KPROBES | 2651 | KPROBES |
| 2646 | P: Ananth N Mavinakayanahalli | 2652 | P: Ananth N Mavinakayanahalli |
| 2647 | M: ananth@in.ibm.com | 2653 | M: ananth@in.ibm.com |