summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2018-04-08 01:44:33 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2018-04-08 01:44:33 +0200
commit706ffc8c26432432fcd6d8a02708b40852bd0bd2 (patch)
treee09278fdedc2dfdeb93ef2bc773d18205d34a74f /drivers/char
parentMerge branch 'misc.compat' of git://git.kernel.org/pub/scm/linux/kernel/git/v... (diff)
parentMerge branch 'smack-for-4.17' of git://github.com/cschaufler/next-smack into ... (diff)
downloadlinux-706ffc8c26432432fcd6d8a02708b40852bd0bd2.tar.xz
linux-706ffc8c26432432fcd6d8a02708b40852bd0bd2.zip
Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull smack update from James Morris: "One small change for Automotive Grade Linux" * 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: Smack: Handle CGROUP2 in the same way that CGROUP
Diffstat (limited to 'drivers/char')
0 files changed, 0 insertions, 0 deletions