git.samba.org / sfrench / cifs-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c659af7 83a1e53)
Merge branch 'smack-for-4.11' of git://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Thu, 26 Jan 2017 22:23:21 +0000 (09:23 +1100)
committerJames Morris <james.l.morris@oracle.com>
Thu, 26 Jan 2017 22:23:21 +0000 (09:23 +1100)
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.