diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 13:14:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-12 13:14:15 -0700 |
| commit | 47ea421af7479b90c481c94826f1c716fcf672cf (patch) | |
| tree | ba0b1b6a7019bf61ea2ca48ac6812af4a3d99647 | |
| parent | e349792a385ed47390d156155b1a1e19af1bf163 (diff) | |
| parent | c3bb4d24ab4b74e11992ccb9828569583166a87d (diff) | |
| download | kernel_samsung_smdk4412-47ea421af7479b90c481c94826f1c716fcf672cf.zip kernel_samsung_smdk4412-47ea421af7479b90c481c94826f1c716fcf672cf.tar.gz kernel_samsung_smdk4412-47ea421af7479b90c481c94826f1c716fcf672cf.tar.bz2 | |
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
| -rw-r--r-- | MAINTAINERS | 16 | ||||
| -rw-r--r-- | drivers/char/vt.c | 1 |
2 files changed, 10 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index de1e4e6..90f8128 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -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 diff --git a/drivers/char/vt.c b/drivers/char/vt.c index de9ebee..c796a86 100644 --- a/drivers/char/vt.c +++ b/drivers/char/vt.c @@ -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 |