]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Thu, 4 Dec 2008 06:16:36 +0000 (17:16 +1100)
committerJames Morris <jmorris@namei.org>
Thu, 4 Dec 2008 06:16:36 +0000 (17:16 +1100)
commitec98ce480ada787f2cfbd696980ff3564415505b
tree1a4d644b38f9f1e4b4e086fde0b195df4a92cf84
parent3496f92beb9aa99ef21fccc154a36c7698e9c538
parentfeaf3848a813a106f163013af6fcf6c4bfec92d9
Merge branch 'master' into next

Conflicts:
fs/nfsd/nfs4recover.c

Manually fixed above to use new creds API functions, e.g.
nfs4_save_creds().

Signed-off-by: James Morris <jmorris@namei.org>
18 files changed:
Documentation/kernel-parameters.txt
fs/cifs/misc.c
fs/namei.c
fs/nfsd/nfs4recover.c
fs/ocfs2/dlm/dlmfs.c
fs/ubifs/dir.c
include/linux/sched.h
include/linux/security.h
ipc/util.c
kernel/cgroup.c
kernel/ptrace.c
kernel/sched.c
kernel/sysctl.c
kernel/trace/trace.c
mm/migrate.c
net/rose/af_rose.c
net/socket.c
net/unix/af_unix.c