projects / cascardo / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e350e24 9b6a9ec)
Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Mon, 19 Sep 2016 02:27:10 +0000 (12:27 +1000)
committerJames Morris <james.l.morris@oracle.com>
Mon, 19 Sep 2016 02:27:10 +0000 (12:27 +1000)
1  2 
include/linux/lsm_hooks.h patch | diff1 | diff2 | blob | history
include/linux/security.h patch | diff1 | diff2 | blob | history

diff --cc include/linux/lsm_hooks.h
Simple merge
diff --cc include/linux/security.h
Simple merge
Unnamed repository; edit this file 'description' to name the repository.