summaryrefslogtreecommitdiffstats
path: root/security/security.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-06 09:44:14 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-06 09:44:14 -0400
commitce804bf598b59427a2c930e5c1f5fe2e51f1b517 (patch)
tree95297a9cc97de3b5886dee3b7b95e9ea178013d2 /security/security.c
parent0803e04011c2e107b9611660301edde94d7010cc (diff)
parent5055610e3d30ed90de77525cf240d0066ac616e4 (diff)
downloadlinux-ce804bf598b59427a2c930e5c1f5fe2e51f1b517.tar.bz2
Merge tag 'media/v4.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull mailcap fixlets from Mauro Carvalho Chehab: "A small fixup for my and Shuah's entries in .mailcap. Basically, those entries were with a syntax that makes get_maintainer.pl to do the wrong thing" * tag 'media/v4.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: .mailmap: Correct entries for Mauro Carvalho Chehab and Shuah Khan
Diffstat (limited to 'security/security.c')
0 files changed, 0 insertions, 0 deletions