Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for...
authorJames Morris <jmorris@namei.org>
Tue, 14 Jun 2011 23:41:48 +0000 (09:41 +1000)
committerJames Morris <jmorris@namei.org>
Tue, 14 Jun 2011 23:41:48 +0000 (09:41 +1000)
commit82b88bb24e28dd4fb4bec30e75412f41326130f0
tree61b1d0eb6ae6059e879571517a0f36bcffdabf34
parent60b8b1de0dd2bf246f0e074d287bb3f0bc42a755
parentded509880f6a0213b09f8ae7bef84acb16eaccbf
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus
security/selinux/selinuxfs.c