]> www.infradead.org Git - linux.git/commitdiff
projects / linux.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3c435c1 6436a12)
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 patch | diff1 | diff2 | blob | history

diff --cc security/selinux/selinuxfs.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.