Merge remote-tracking branch 'vfs/for-next'

Conflicts:
	fs/ext4/namei.c
	mm/shmem.c

diff --cc arch/x86/ia32/ia32_aout.c
Simple merge

diff --cc fs/binfmt_aout.c
Simple merge

diff --cc fs/binfmt_elf.c
Simple merge

diff --cc fs/coredump.c
Simple merge