Merge tag 'media/v4.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

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

diff --cc .mailmap
index c0d57049d3f08ff6b7a9adfb11b203770731640a,46a3b6189cae3f869a60e0490a2bc6fb1e691744..2a91c14c80bf5315730eadceb7896bcb9d681aaf
--- 1/.mailmap
--- 2/.mailmap
+++ b/.mailmap
@@@ -92,11 -92,15 +92,17 @@@ Krzysztof Kozlowski <[email protected]> <
  Kuninori Morimoto <[email protected]>
  Leonid I Ananiev <[email protected]>
  Linas Vepstas <[email protected]>
 +Linus Lüssing <[email protected]> <[email protected]>
 +Linus Lüssing <[email protected]> <[email protected]>
  Mark Brown <[email protected]>
  Matthieu CASTET <[email protected]>
- Mauro Carvalho Chehab <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]> <[email protected]>
+ Mauro Carvalho Chehab <[email protected]> <[email protected]>
+ Mauro Carvalho Chehab <[email protected]> <[email protected]>
+ Mauro Carvalho Chehab <[email protected]> <[email protected]>
+ Mauro Carvalho Chehab <[email protected]> <[email protected]>
+ Mauro Carvalho Chehab <[email protected]> <[email protected]>
+ Mauro Carvalho Chehab <[email protected]> <[email protected]>
+ Mauro Carvalho Chehab <[email protected]> <[email protected]>
  Matt Ranostay <[email protected]> Matthew Ranostay <[email protected]>
  Matt Ranostay <[email protected]> <[email protected]>
  Mayuresh Janorkar <[email protected]>