diff options
| author | Linus Torvalds | 2016-08-06 08:44:14 -0500 |
|---|---|---|
| committer | Linus Torvalds | 2016-08-06 08:44:14 -0500 |
| commit | ce804bf598b59427a2c930e5c1f5fe2e51f1b517 (patch) | |
| tree | 95297a9cc97de3b5886dee3b7b95e9ea178013d2 /.mailmap | |
| parent | 0803e04011c2e107b9611660301edde94d7010cc (diff) | |
| parent | 5055610e3d30ed90de77525cf240d0066ac616e4 (diff) | |
| download | kernel-ce804bf598b59427a2c930e5c1f5fe2e51f1b517.tar.gz kernel-ce804bf598b59427a2c930e5c1f5fe2e51f1b517.tar.xz kernel-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 '.mailmap')
| -rw-r--r-- | .mailmap | 13 |
1 files changed, 11 insertions, 2 deletions
| @@ -96,7 +96,13 @@ Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de> | |||
| 96 | Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch> | 96 | Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch> |
| 97 | Mark Brown <broonie@sirena.org.uk> | 97 | Mark Brown <broonie@sirena.org.uk> |
| 98 | Matthieu CASTET <castet.matthieu@free.fr> | 98 | Matthieu CASTET <castet.matthieu@free.fr> |
| 99 | 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> | 99 | Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br> |
| 100 | Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com> | ||
| 101 | Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org> | ||
| 102 | Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com> | ||
| 103 | Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com> | ||
| 104 | Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com> | ||
| 105 | Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com> | ||
| 100 | Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com> | 106 | Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com> |
| 101 | Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com> | 107 | Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com> |
| 102 | Mayuresh Janorkar <mayur@ti.com> | 108 | Mayuresh Janorkar <mayur@ti.com> |
| @@ -132,7 +138,10 @@ Santosh Shilimkar <santosh.shilimkar@oracle.org> | |||
| 132 | Sascha Hauer <s.hauer@pengutronix.de> | 138 | Sascha Hauer <s.hauer@pengutronix.de> |
| 133 | S.Çağlar Onur <caglar@pardus.org.tr> | 139 | S.Çağlar Onur <caglar@pardus.org.tr> |
| 134 | Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com> | 140 | Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com> |
| 135 | Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> <shuah.khan@hp.com> <shuahkh@osg.samsung.com> <shuah.kh@samsung.com> | 141 | Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com> |
| 142 | Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com> | ||
| 143 | Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com> | ||
| 144 | Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com> | ||
| 136 | Simon Kelley <simon@thekelleys.org.uk> | 145 | Simon Kelley <simon@thekelleys.org.uk> |
| 137 | Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr> | 146 | Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr> |
| 138 | Stephen Hemminger <shemminger@osdl.org> | 147 | Stephen Hemminger <shemminger@osdl.org> |