Merge commit 'v2.6.29-rc1' into tracing/urgent

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6f65a26..9b75022 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2590,6 +2590,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