]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for...
authorJames Morris <james.l.morris@oracle.com>
Fri, 10 Jul 2015 23:13:45 +0000 (09:13 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 10 Jul 2015 23:13:45 +0000 (09:13 +1000)
1  2 
security/selinux/hooks.c

Simple merge