Merge branch 'master' into next
authorJames Morris <jmorris@namei.org>
Thu, 28 Aug 2008 00:47:34 +0000 (10:47 +1000)
committerJames Morris <jmorris@namei.org>
Thu, 28 Aug 2008 00:47:34 +0000 (10:47 +1000)
1  2 
security/security.c
security/selinux/hooks.c

Simple merge
Simple merge