From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 6 Aug 2016 13:44:14 +0000 (-0400)
Subject: Merge tag 'media/v4.8-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Tag: v4.8-rc1~9
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=ce804bf598b59427a2c930e5c1f5fe2e51f1b517

Merge tag 'media/v4.8-6' of git://git./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
---

ce804bf598b59427a2c930e5c1f5fe2e51f1b517
diff --cc .mailmap
index c0d57049d3f0,46a3b6189cae..2a91c14c80bf
--- a/.mailmap
+++ b/.mailmap
@@@ -92,11 -92,15 +92,17 @@@ Krzysztof Kozlowski <krzk@kernel.org> <
  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
  Leonid I Ananiev <leonid.i.ananiev@intel.com>
  Linas Vepstas <linas@austin.ibm.com>
 +Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
 +Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
  Mark Brown <broonie@sirena.org.uk>
  Matthieu CASTET <castet.matthieu@free.fr>
- Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> <mchehab@infradead.org> <mchehab@redhat.com> <m.chehab@samsung.com> <mchehab@osg.samsung.com> <mchehab@s-opensource.com>
+ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
+ Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
+ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org>
+ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
+ Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
+ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
+ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
  Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
  Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
  Mayuresh Janorkar <mayur@ti.com>