Merge branch 'next' into for-linus
authorJames Morris <jmorris@namei.org>
Tue, 24 May 2011 12:55:24 +0000 (22:55 +1000)
committerJames Morris <jmorris@namei.org>
Tue, 24 May 2011 12:55:24 +0000 (22:55 +1000)
commit434d42cfd05a7cc452457a81d2029540cba12150
tree3a6b9b7f9ff2e1b7409dd66c15242b2a75aa4422
parentd762f4383100c2a87b1a3f2d678cd3b5425655b4
parent12a5a2621b1ee14d32beca35304d7c6076a58815
Merge branch 'next' into for-linus
include/linux/capability.h
include/linux/init_task.h
include/linux/kmod.h
kernel/kmod.c
kernel/sysctl.c
security/keys/user_defined.c