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)
commit86d688984deefa3ae5a802880c11f2b408b5d6cf
tree7ea5e8189b0a774626d3ed7c3c87df2495a4c4a0
parent93c06cbbf9fea5d5be1778febb7fa9ab1a74e5f5
parent4c246edd2550304df5b766cc841584b2bb058843
Merge branch 'master' into next
security/security.c
security/selinux/hooks.c