summaryrefslogtreecommitdiffstats
path: root/fs/fuse
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-08-06 15:44:14 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2016-08-06 15:44:14 +0200
commitce804bf598b59427a2c930e5c1f5fe2e51f1b517 (patch)
tree95297a9cc97de3b5886dee3b7b95e9ea178013d2 /fs/fuse
parentMerge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff)
parent.mailmap: Correct entries for Mauro Carvalho Chehab and Shuah Khan (diff)
downloadlinux-ce804bf598b59427a2c930e5c1f5fe2e51f1b517.tar.xz
linux-ce804bf598b59427a2c930e5c1f5fe2e51f1b517.zip
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 'fs/fuse')
0 files changed, 0 insertions, 0 deletions