Merge branch 'master' into next

Conflicts:
	security/keys/internal.h
	security/keys/process_keys.c
	security/keys/request_key.c

Fixed conflicts above by using the non 'tsk' versions.

Signed-off-by: James Morris <jmorris@namei.org>

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

diff --cc fs/autofs4/dev-ioctl.c
Simple merge

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

diff --cc fs/fat/file.c
Simple merge

diff --cc fs/fat/inode.c
Simple merge

diff --cc fs/namespace.c
Simple merge

diff --cc fs/nfsd/vfs.c
Simple merge

diff --cc fs/ocfs2/namei.c
Simple merge

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

diff --cc include/net/scm.h
Simple merge

diff --cc kernel/cgroup.c
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/timer.c
Simple merge

diff --cc kernel/trace/trace.c
Simple merge

diff --cc kernel/workqueue.c
Simple merge

diff --cc mm/mempolicy.c
Simple merge

diff --cc mm/migrate.c
Simple merge

diff --cc mm/oom_kill.c
Simple merge

diff --cc net/9p/client.c
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/scm.c
Simple merge

diff --cc net/unix/af_unix.c
Simple merge