]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbe5d6b 898bfc1)
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...
authorCasey Schaufler <cschaufler@cschaufler-intel.(none)>
Fri, 4 May 2012 19:52:54 +0000 (12:52 -0700)
committerCasey Schaufler <cschaufler@cschaufler-intel.(none)>
Fri, 4 May 2012 19:52:54 +0000 (12:52 -0700)
1  2 
security/smack/smack_lsm.c patch | diff1 | diff2 | blob | history

diff --cc security/smack/smack_lsm.c
Simple merge
Linux kernel for KaRo TX COM modules