projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37babe4 81bd0d5)
Merge branch 'smack-for-4.5' of https://github.com/cschaufler/smack-next into next
authorJames Morris <james.l.morris@oracle.com>
Sat, 26 Dec 2015 05:11:13 +0000 (16:11 +1100)
committerJames Morris <james.l.morris@oracle.com>
Sat, 26 Dec 2015 05:11:13 +0000 (16:11 +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.