]> 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, 27 Mar 2015 09:33:27 +0000 (20:33 +1100)
committerJames Morris <james.l.morris@oracle.com>
Fri, 27 Mar 2015 09:33:27 +0000 (20:33 +1100)
1  2 
security/selinux/selinuxfs.c

Simple merge