diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-06 15:44:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-08-06 15:44:14 +0200 |
| commit | ce804bf598b59427a2c930e5c1f5fe2e51f1b517 (patch) | |
| tree | 95297a9cc97de3b5886dee3b7b95e9ea178013d2 /fs/ocfs2/dlmfs/userdlm.h | |
| parent | Merge 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) | |
| download | linux-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/ocfs2/dlmfs/userdlm.h')
0 files changed, 0 insertions, 0 deletions