review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.git / commit

author	James Morris <jmorris@namei.org>
	Fri, 14 Nov 2008 00:29:12 +0000 (11:29 +1100)
committer	James Morris <jmorris@namei.org>
	Fri, 14 Nov 2008 00:29:12 +0000 (11:29 +1100)
commit	2b828925652340277a889cbc11b2d0637f7cdaf7
tree	32fcb3d3e466fc419fad2d3717956a5b5ad3d35a	tree \| snapshot
parent	3a3b7ce9336952ea7b9564d976d068a238976c9d	commit \| diff
parent	58e20d8d344b0ee083febb18c2b021d2427e56ca	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
fs/autofs4/dev-ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ialloc.c	diff1 \|	diff2 \|	blob \| history
fs/fat/file.c	diff1 \|	diff2 \|	blob \| history
fs/fat/inode.c	diff1 \|	diff2 \|	blob \| history
fs/namespace.c	diff1 \|	diff2 \|	blob \| history
fs/nfsd/vfs.c	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/namei.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/net/scm.h	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/timer.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
kernel/workqueue.c	diff1 \|	diff2 \|	blob \| history
mm/mempolicy.c	diff1 \|	diff2 \|	blob \| history
mm/migrate.c	diff1 \|	diff2 \|	blob \| history
mm/oom_kill.c	diff1 \|	diff2 \|	blob \| history
net/9p/client.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/scm.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;

RSS Atom

Documentation/kernel-parameters.txt	diff1 \|	diff2 \|	blob \| history
fs/autofs4/dev-ioctl.c	diff1 \|	diff2 \|	blob \| history
fs/ext4/ialloc.c	diff1 \|	diff2 \|	blob \| history
fs/fat/file.c	diff1 \|	diff2 \|	blob \| history
fs/fat/inode.c	diff1 \|	diff2 \|	blob \| history
fs/namespace.c	diff1 \|	diff2 \|	blob \| history
fs/nfsd/vfs.c	diff1 \|	diff2 \|	blob \| history
fs/ocfs2/namei.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
include/net/scm.h	diff1 \|	diff2 \|	blob \| history
kernel/cgroup.c	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history
kernel/timer.c	diff1 \|	diff2 \|	blob \| history
kernel/trace/trace.c	diff1 \|	diff2 \|	blob \| history
kernel/workqueue.c	diff1 \|	diff2 \|	blob \| history
mm/mempolicy.c	diff1 \|	diff2 \|	blob \| history
mm/migrate.c	diff1 \|	diff2 \|	blob \| history
mm/oom_kill.c	diff1 \|	diff2 \|	blob \| history
net/9p/client.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/core/scm.c	diff1 \|	diff2 \|	blob \| history
net/unix/af_unix.c	diff1 \|	diff2 \|	blob \| history