]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a754a67 465954c)
Merge remote-tracking branch 'selinux/master'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 03:26:46 +0000 (14:26 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 20 Dec 2013 03:26:46 +0000 (14:26 +1100)
Conflicts:
security/selinux/hooks.c

1  2 
security/selinux/hooks.c patch | diff1 | diff2 | blob | history

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