Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Wed, 19 Aug 2009 23:18:42 +0000 (09:18 +1000)
committerJames Morris <jmorris@namei.org>
Wed, 19 Aug 2009 23:18:42 +0000 (09:18 +1000)
commitece13879e74313e62109e0755dd3d4f172df89e2
tree1fe96ab392c1ff203a6fb3f67ed0ed577056572e
parentb08dc3eba0c34027010caeda258f495074ae3a54
parent6c30c53fd5ae6a99a23ad78e90c428d2c8ffb07f
Merge branch 'master' into next

Conflicts:
security/Kconfig

Manual fix.

Signed-off-by: James Morris <jmorris@namei.org>
include/linux/sched.h
security/selinux/hooks.c