projects / platform / kernel / linux-rpi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a3d64df 4fbe63d)
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
authorJames Morris <james.l.morris@oracle.com>
Sat, 2 Aug 2014 12:58:02 +0000 (22:58 +1000)
committerJames Morris <james.l.morris@oracle.com>
Sat, 2 Aug 2014 12:58:02 +0000 (22:58 +1000)
1  2 
security/smack/smack_access.c patch | diff1 | diff2 | blob | history
security/smack/smack_lsm.c patch | diff1 | diff2 | blob | history
security/smack/smackfs.c patch | diff1 | diff2 | blob | history

diff --cc security/smack/smack_access.c
Simple merge
diff --cc security/smack/smack_lsm.c
Simple merge
diff --cc security/smack/smackfs.c
Simple merge
Domain: System / Kernel;