diff options
| author | Linus Torvalds | 2018-04-07 16:44:33 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2018-04-07 16:44:33 -0700 |
| commit | 706ffc8c26432432fcd6d8a02708b40852bd0bd2 (patch) | |
| tree | e09278fdedc2dfdeb93ef2bc773d18205d34a74f /kernel/cpu.c | |
| parent | bf6879dcc483f0aa087afe27d103285daf435951 (diff) | |
| parent | d54d27c9571245e4990bb8d020b109b92115683b (diff) | |
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 'kernel/cpu.c')
0 files changed, 0 insertions, 0 deletions