Merge branch 'next' into for-linus

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

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

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

diff --cc ipc/shm.c
Simple merge

diff --cc kernel/sysctl.c
Simple merge