Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47ea421a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://linux-arm.org/linux-2.6 

* 'for-linus' of git://linux-arm.org/linux-2.6:
  kmemleak: Add more info to the MAINTAINERS entry
  kmemleak: Remove the kmemleak.h include in drivers/char/vt.c
parents e349792a c3bb4d24

MAINTAINERS

+10 −6
Original line number Diff line number Diff line
@@ -3363,6 +3363,16 @@ F: drivers/serial/kgdboc.c 
F:	include/linux/kgdb.h

F:	kernel/kgdb.c



KMEMLEAK

P:	Catalin Marinas

M:	catalin.marinas@arm.com

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	Documentation/kmemleak.txt

F:	include/linux/kmemleak.h

F:	mm/kmemleak.c

F:	mm/kmemleak-test.c



KMEMTRACE

P:	Eduard - Gabriel Munteanu

M:	eduard.munteanu@linux360.ro
@@ -3372,12 +3382,6 @@ 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

drivers/char/vt.c

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ 
#include <linux/io.h>

#include <asm/system.h>

#include <linux/uaccess.h>

#include <linux/kmemleak.h>



#define MAX_NR_CON_DRIVER 16