Merge branches 'tracing/ftrace', 'tracing/kmemtrace' and 'linus' into tracing/core

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 474ec0c..9c3a4f0 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2606,6 +2606,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