diff --git a/[refs] b/[refs] index b499a0d4544f..5a1d11c975a4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0822ee4ac1ae6af5a953f97f75553738834b10b9 +refs/heads/master: 3aa27bbe7a6536d1ec859d3a97caf3319b5081b7 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index cf4abddfc8a4..e5af3063e8be 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3359,6 +3359,12 @@ F: Documentation/trace/kmemtrace.txt F: include/trace/kmemtrace.h F: kernel/trace/kmemtrace.c +KMEMLEAK +P: Catalin Marinas +M: catalin.marinas@arm.com +L: linux-kernel@vger.kernel.org +S: Maintained + KPROBES P: Ananth N Mavinakayanahalli M: ananth@in.ibm.com