Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Wed, 5 Nov 2008 23:12:34 +0000 (07:12 +0800)
committerJames Morris <jmorris@namei.org>
Wed, 5 Nov 2008 23:12:34 +0000 (07:12 +0800)
1  2 
security/selinux/hooks.c

Simple merge