summaryrefslogtreecommitdiff
path: root/security/apparmor/crypto.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-10-28 14:43:29 +0300
committerTakashi Iwai <tiwai@suse.de>2019-10-28 14:43:34 +0300
commite2e556a9549eebde9797a04729efdfc54f37e5cc (patch)
treebe8e60c5c7021ebb3bda12ebe8a921fbb8883c4e /security/apparmor/crypto.c
parent0a671dc500553cf6f4cc3efbcb0923b5e9adccb5 (diff)
parent1a7f60b9df614bb36d14dc0c0bc898a31b2b506f (diff)
downloadlinux-e2e556a9549eebde9797a04729efdfc54f37e5cc.tar.xz
Merge branch 'for-linus' into for-next
Back-merge the development process for catching up the HD-audio fix (and apply a new one on top of that). Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'security/apparmor/crypto.c')
0 files changed, 0 insertions, 0 deletions