Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for...
authorJames Morris <jmorris@namei.org>
Wed, 4 May 2011 01:59:34 +0000 (11:59 +1000)
committerJames Morris <jmorris@namei.org>
Wed, 4 May 2011 01:59:34 +0000 (11:59 +1000)
commit6f239284542bae297d27355d06afbb8df23c5db9
treeb0ba42fb54cd05178c61584e0913be38a57f0384
parent609cfda586c7fe3e5d1a02c51edb587506294167
parentbf69d41d198138e3c601e9a6645f4f1369aff7e0
Merge branch 'for-linus' of git://git.infradead.org/users/eparis/selinux into for-linus
security/selinux/hooks.c