summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-02-13 16:54:56 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2009-02-13 16:54:56 +1100
commite9f41a759160c4df04fa1cbab83bda9ecf630fd0 (patch)
treef1da0ca6b696c484474a08167ad695dc6992ac94 /MAINTAINERS
parentdeed164525a235b2770016c77678009dce57ec1c (diff)
parenta2a127e219d3eeca56232bad1f7e8681a10e609e (diff)
Merge commit 'kmemleak/kmemleak'
Conflicts: include/linux/slab.h init/main.c lib/Kconfig.debug mm/slab.c mm/slob.c mm/slub.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0114808fbfff..f9d8304bf0f8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2566,6 +2566,12 @@ L: kernel-janitors@vger.kernel.org
W: http://www.kerneljanitors.org/
S: Maintained
+KERNEL MEMORY LEAK DETECTOR
+P: Catalin Marinas
+M: catalin.marinas@arm.com
+L: linux-kernel@vger.kernel.org
+S: Maintained
+
KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
P: J. Bruce Fields
M: bfields@fieldses.org