# # Makefile for ALSA # Copyright (c) 2001 by Jaroslav Kysela # snd-azt1605-objs := azt1605.o snd-azt2316-objs := azt2316.o obj-$(CONFIG_SND_AZT1605) += snd-azt1605.o obj-$(CONFIG_SND_AZT2316) += snd-azt2316.o d' href='https://git.distanz.ch/cgit.cgi/linux/net-next.git/atom/security/apparmor?h=master' type='application/atom+xml'/>
summaryrefslogtreecommitdiff
path: root/security/apparmor
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2017-01-24 09:57:18 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2017-01-24 09:57:18 -0800
commit62ed8ceda1699acae01b666497f004bfd3d67a6f (patch)
treefe38c83c49dfd568b540666948ef78cb9d082c38 /security/apparmor
parent1c3415a06b1016a596bfe59e0cfee56c773aa958 (diff)
parent7a308bb3016f57e5be11a677d15b821536419d36 (diff)
Merge tag 'v4.10-rc5' into for-linus
Sync up with mainline to apply fixup to a commit that came through power supply tree.
Diffstat (limited to 'security/apparmor')