Merge branch 'linus'

diff --cc MAINTAINERS
Simple merge

diff --cc Makefile
Simple merge

diff --cc mm/mmap.c
Simple merge