Merge branch 'master' into next

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc fs/compat.c
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc fs/inode.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc ipc/shm.c
Simple merge

diff --cc kernel/user.c
Simple merge

diff --cc mm/mmap.c
Simple merge

diff --cc mm/shmem.c
Simple merge

diff --cc security/smack/smack_lsm.c
Simple merge