Slab maintainer & Credits update
Signed-off-by: Christoph Lameter <clameter@sgi.com>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/CREDITS b/CREDITS
index 10c214d..832436e 100644
--- a/CREDITS
+++ b/CREDITS
@@ -966,6 +966,7 @@
E: penberg@cs.helsinki.fi
W: http://www.cs.helsinki.fi/u/penberg/
D: Various kernel hacks, fixes, and cleanups.
+D: Slab allocators
S: Finland
N: David Engebretsen
@@ -1939,8 +1940,8 @@
N: Christoph Lameter
E: christoph@lameter.com
D: Digiboard PC/Xe and PC/Xi, Digiboard EPCA
-D: Early protocol filter for bridging code
-D: Bug fixes
+D: NUMA support, Slab allocators, Page migration
+D: Scalability, Time subsystem
N: Paul Laufer
E: paul@laufernet.com
diff --git a/MAINTAINERS b/MAINTAINERS
index 01f222e..babd00b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3339,6 +3339,14 @@
W: http://www.winischhofer.at/linuxsisusbvga.shtml
S: Maintained
+SLAB ALLOCATOR
+P: Christoph Lameter
+M: clameter@sgi.com
+P: Pekka Enberg
+M: penberg@cs.helsinki.fi
+L: linux-mm@kvack.org
+S: Maintained
+
SMC91x ETHERNET DRIVER
P: Nicolas Pitre
M: nico@cam.org
