diff --git a/[refs] b/[refs] index 98e75c1ab8e6..0922cbc4bc46 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 68a1b1955957e222d890f550d2a44ae598db3de9 +refs/heads/master: 2ed1c5257b5d669df2a64bd53e61dc19c7d936cd diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 89e4d4b145bb..1af022e63668 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3684,7 +3684,7 @@ F: kernel/debug/ KMEMCHECK M: Vegard Nossum -M: Pekka Enberg +M: Pekka Enberg 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 -M: Pekka Enberg +M: Pekka Enberg M: Matt Mackall L: linux-mm@kvack.org S: Maintained