Merge branch 'next' into for-linus
James Morris [Tue, 24 May 2011 12:55:24 +0000 (22:55 +1000)]
1  2 
include/linux/capability.h
include/linux/init_task.h
include/linux/kmod.h
kernel/kmod.c
kernel/sysctl.c
security/keys/user_defined.c

Simple merge
Simple merge
Simple merge
diff --cc kernel/kmod.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge
Simple merge