Merge branch 'master' into next
James Morris [Fri, 14 Nov 2008 00:29:12 +0000 (11:29 +1100)]
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>

23 files changed:
1  2 
Documentation/kernel-parameters.txt
fs/autofs4/dev-ioctl.c
fs/ext4/ialloc.c
fs/fat/file.c
fs/fat/inode.c
fs/namespace.c
fs/nfsd/vfs.c
fs/ocfs2/namei.c
include/linux/sched.h
include/net/scm.h
kernel/cgroup.c
kernel/exit.c
kernel/sched.c
kernel/timer.c
kernel/trace/trace.c
kernel/workqueue.c
mm/mempolicy.c
mm/migrate.c
mm/oom_kill.c
net/9p/client.c
net/core/dev.c
net/core/scm.c
net/unix/af_unix.c

Simple merge
Simple merge
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
Simple merge
Simple merge
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
Simple merge
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
Simple merge