Merge branch 'master' into next
James Morris [Wed, 19 Aug 2009 23:18:42 +0000 (09:18 +1000)]
Conflicts:
security/Kconfig

Manual fix.

Signed-off-by: James Morris <jmorris@namei.org>

1  2 
include/linux/sched.h
security/selinux/hooks.c

Simple merge
Simple merge