summaryrefslogtreecommitdiff
path: root/security/apparmor/apparmorfs.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2020-05-28 11:08:46 +0300
committerTakashi Iwai <tiwai@suse.de>2020-05-28 11:08:50 +0300
commit6d2848402619f33895e419430ad43a223c4866fc (patch)
treea88115a04139f68e5240dfdf40e11c752a3e73a5 /security/apparmor/apparmorfs.c
parente0b2db351bc708037571deb3fc82c7d9043b4ea8 (diff)
parent630e36126e420e1756378b3427b42711ce0b9ddd (diff)
downloadlinux-6d2848402619f33895e419430ad43a223c4866fc.tar.xz
Merge branch 'for-linus' into for-next
Back-merge 5.7-devel branch for further development. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'security/apparmor/apparmorfs.c')
0 files changed, 0 insertions, 0 deletions