Merge branch 'this_cpu_ops' into for-2.6.38

[linux-2.6-block.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 6a588873cf8d2da8b00f803a1dcd8d96841292bd..cc27793e87563429947119a905bf8e9f7a71335f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4602,6 +4602,16 @@ S:       Maintained
 F:     crypto/pcrypt.c
 F:     include/crypto/pcrypt.h
 
+PER-CPU MEMORY ALLOCATOR
+M:     Tejun Heo <tj@kernel.org>
+M:     Christoph Lameter <cl@linux-foundation.org>
+L:     linux-kernel@vger.kernel.org
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git
+S:     Maintained
+F:     include/linux/percpu*.h
+F:     mm/percpu*.c
+F:     arch/*/include/asm/percpu.h
+
 PER-TASK DELAY ACCOUNTING
 M:     Balbir Singh <balbir@linux.vnet.ibm.com>
 S:     Maintained