Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index bd549618aea925e8c535d96e3568e753c13f70f4..c7d3e51c70643391724ed27ba2aba18dc2a5b531 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -9835,6 +9835,14 @@ F:       kernel/sched/membarrier.c
 F:     include/uapi/linux/membarrier.h
 F:     arch/powerpc/include/asm/membarrier.h
 
 F:     include/uapi/linux/membarrier.h
 F:     arch/powerpc/include/asm/membarrier.h
 

+MEMBLOCK
+M:     Mike Rapoport <rppt@linux.ibm.com>
+L:     linux-mm@kvack.org
+S:     Maintained
+F:     include/linux/memblock.h
+F:     mm/memblock.c
+F:     Documentation/core-api/boot-time-mm.rst
+

 MEMORY MANAGEMENT
 L:     linux-mm@kvack.org
 W:     http://www.linux-mm.org
 MEMORY MANAGEMENT
 L:     linux-mm@kvack.org
 W:     http://www.linux-mm.org