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)
1  2 
security/selinux/hooks.c

Simple merge