]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Fri, 14 Nov 2008 00:29:12 +0000 (11:29 +1100)
committerJames Morris <jmorris@namei.org>
Fri, 14 Nov 2008 00:29:12 +0000 (11:29 +1100)
commit2b828925652340277a889cbc11b2d0637f7cdaf7
tree32fcb3d3e466fc419fad2d3717956a5b5ad3d35a
parent3a3b7ce9336952ea7b9564d976d068a238976c9d
parent58e20d8d344b0ee083febb18c2b021d2427e56ca
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>
23 files changed:
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