]> pilppa.org Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3496f92 feaf384)
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
tree1a4d644b38f9f1e4b4e086fde0b195df4a92cf84tree | snapshot
parent3496f92beb9aa99ef21fccc154a36c7698e9c538commit | diff
parentfeaf3848a813a106f163013af6fcf6c4bfec92d9commit | diff
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 diff1 | diff2 | blob | history
fs/cifs/misc.c diff1 | diff2 | blob | history
fs/namei.c diff1 | diff2 | blob | history
fs/nfsd/nfs4recover.c diff1 | diff2 | blob | history
fs/ocfs2/dlm/dlmfs.c diff1 | diff2 | blob | history
fs/ubifs/dir.c diff1 | diff2 | blob | history
include/linux/sched.h diff1 | diff2 | blob | history
include/linux/security.h diff1 | diff2 | blob | history
ipc/util.c diff1 | diff2 | blob | history
kernel/cgroup.c diff1 | diff2 | blob | history
kernel/ptrace.c diff1 | diff2 | blob | history
kernel/sched.c diff1 | diff2 | blob | history
kernel/sysctl.c diff1 | diff2 | blob | history
kernel/trace/trace.c diff1 | diff2 | blob | history
mm/migrate.c diff1 | diff2 | blob | history
net/rose/af_rose.c diff1 | diff2 | blob | history
net/socket.c diff1 | diff2 | blob | history
net/unix/af_unix.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.