| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 6 Aug 2016 13:44:14 +0000 (09:44 -0400) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sat, 6 Aug 2016 13:44:14 +0000 (09:44 -0400) | ||
| commit | ce804bf598b59427a2c930e5c1f5fe2e51f1b517 | |
| tree | 95297a9cc97de3b5886dee3b7b95e9ea178013d2 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 0803e04011c2e107b9611660301edde94d7010cc | commit | diff |
| parent | 5055610e3d30ed90de77525cf240d0066ac616e4 | commit | diff |
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
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
| .mailmap | diff1 | | diff2 | | blob | history |