Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Mon, 26 May 2014 12:38:46 +0000 (22:38 +1000)
committerJames Morris <james.l.morris@oracle.com>
Mon, 26 May 2014 12:38:46 +0000 (22:38 +1000)
1  2 
security/selinux/hooks.c

Simple merge