projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6041c1 ece3824)
Merge branch 'smack-for-4.8' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Fri, 8 Jul 2016 00:41:15 +0000 (10:41 +1000)
committerJames Morris <james.l.morris@oracle.com>
Fri, 8 Jul 2016 00:41:15 +0000 (10:41 +1000)
1  2 
security/smack/smack_lsm.c patch | diff1 | diff2 | blob | history

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