]> www.infradead.org Git - linux-platform-drivers-x86.git/commitdiff
projects / linux-platform-drivers-x86.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1604f87 892e8ca)
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 patch | diff1 | diff2 | blob | history

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