git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'connlimit' of git://dev.medozas.de/linux
[pandora-kernel.git]
/
MAINTAINERS
diff --git
a/MAINTAINERS
b/MAINTAINERS
index
89e4d4b
..
1af022e
100644
(file)
--- a/
MAINTAINERS
+++ b/
MAINTAINERS
@@
-3684,7
+3684,7
@@
F: kernel/debug/
KMEMCHECK
M: Vegard Nossum <vegardno@ifi.uio.no>
KMEMCHECK
M: Vegard Nossum <vegardno@ifi.uio.no>
-M: Pekka Enberg <penberg@
cs.helsinki.fi
>
+M: Pekka Enberg <penberg@
kernel.org
>
S: Maintained
F: Documentation/kmemcheck.txt
F: arch/x86/include/asm/kmemcheck.h
S: Maintained
F: Documentation/kmemcheck.txt
F: arch/x86/include/asm/kmemcheck.h
@@
-5646,7
+5646,7
@@
F: drivers/net/sky2.*
SLAB ALLOCATOR
M: Christoph Lameter <cl@linux-foundation.org>
SLAB ALLOCATOR
M: Christoph Lameter <cl@linux-foundation.org>
-M: Pekka Enberg <penberg@
cs.helsinki.fi
>
+M: Pekka Enberg <penberg@
kernel.org
>
M: Matt Mackall <mpm@selenic.com>
L: linux-mm@kvack.org
S: Maintained
M: Matt Mackall <mpm@selenic.com>
L: linux-mm@kvack.org
S: Maintained