Merge branch 'next' into for-linus

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

diff --cc arch/mips/kernel/vpe.c
Simple merge

diff --cc arch/um/drivers/mconsole_kern.c
Simple merge

diff --cc fs/9p/fid.c
Simple merge

diff --cc fs/9p/vfs_inode.c
Simple merge

diff --cc fs/exec.c
Simple merge

diff --cc fs/exportfs/expfs.c
Simple merge

diff --cc fs/ext4/balloc.c
Simple merge

diff --cc fs/fcntl.c
Simple merge

diff --cc fs/proc/base.c
Simple merge

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

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

diff --cc kernel/auditsc.c
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc mm/migrate.c
Simple merge

diff --cc net/socket.c
Simple merge