ce804bf598
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAABAgAGBQJXpbwiAAoJEAhfPr2O5OEV8fsP/RgrPl3LqFZyRgFBigWgumQ1 JdWSVs0Vhi7/D7B+MfUI5vdSygzSHQo9bukrMdwGEXYiG6VNzFc2pCI6Fklu1Att qbiVIotsecTlXdBFoDpxpA8AfvPCHFCjh3ufFWldMPjMTNp6aDg1OBcod160tDx7 IABoB2r0Tdvwy5Y1szdxjaxisptab3T7HYJKaXhkClEjxlp+zrCmro9XHNE7s4SB Z5UrvBoIcUCw8oSQ2b9g4+2Q7sTE8wWHugAhVaeoT8rBp3xSCMgxmxArYUaELNst Ce4IzJAefoJ9tQyN2eQp3sKE+wviqZ1Ywct3D5YIs4nju4HbZGmqa9CDjg6JRBCQ 0TWWwayyVPrLgm3uXx264wsTjBa2t3fP3wZTwlAoITFqEZJGx9afMmOAoejJch2E O2hFpVkig+axHAZdqhgRLlXkhX6hLuI3BSrRHiLMloatuHij7XLAxFOD0Fu4ZVq0 OkxswOZU/Dh69uYd01hYIvUTN7fzZbxxaR3yM/134TtxnqMJy/kbjohVMmKafn6E LV+TAZye2cEgNnMRJHWQMkxmmvRax9GQgdK8d2BKnbVsO6alyzzhU3ShGw4f12lt rUu8PGC1iAgHpc5kwYULOPLXC7Wio2V7AmdG/XWzxnMBHN7bfcXec6ipjbyQYMVr 9Xz3fGaMCdoBDxCZsVMD =06UE -----END PGP SIGNATURE----- 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
164 lines
7.1 KiB
Text
164 lines
7.1 KiB
Text
#
|
|
# This list is used by git-shortlog to fix a few botched name translations
|
|
# in the git archive, either because the author's full name was messed up
|
|
# and/or not always written the same way, making contributions from the
|
|
# same person appearing not to be so or badly displayed.
|
|
#
|
|
# repo-abbrev: /pub/scm/linux/kernel/git/
|
|
#
|
|
|
|
Aaron Durbin <adurbin@google.com>
|
|
Adam Oldham <oldhamca@gmail.com>
|
|
Adam Radford <aradford@gmail.com>
|
|
Adrian Bunk <bunk@stusta.de>
|
|
Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
|
|
Alan Cox <alan@lxorguk.ukuu.org.uk>
|
|
Alan Cox <root@hraefn.swansea.linux.org.uk>
|
|
Aleksey Gorelov <aleksey_gorelov@phoenix.com>
|
|
Al Viro <viro@ftp.linux.org.uk>
|
|
Al Viro <viro@zenIV.linux.org.uk>
|
|
Andreas Herrmann <aherrman@de.ibm.com>
|
|
Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
|
|
Andrew Morton <akpm@linux-foundation.org>
|
|
Andrew Vasquez <andrew.vasquez@qlogic.com>
|
|
Andy Adamson <andros@citi.umich.edu>
|
|
Antoine Tenart <antoine.tenart@free-electrons.com>
|
|
Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
|
|
Archit Taneja <archit@ti.com>
|
|
Arnaud Patard <arnaud.patard@rtp-net.org>
|
|
Arnd Bergmann <arnd@arndb.de>
|
|
Axel Dyks <xl@xlsigned.net>
|
|
Axel Lin <axel.lin@gmail.com>
|
|
Ben Gardner <bgardner@wabtec.com>
|
|
Ben M Cahill <ben.m.cahill@intel.com>
|
|
Björn Steinbrink <B.Steinbrink@gmx.de>
|
|
Boris Brezillon <boris.brezillon@free-electrons.com>
|
|
Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com>
|
|
Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com>
|
|
Brian Avery <b.avery@hp.com>
|
|
Brian King <brking@us.ibm.com>
|
|
Christoph Hellwig <hch@lst.de>
|
|
Christophe Ricard <christophe.ricard@gmail.com>
|
|
Corey Minyard <minyard@acm.org>
|
|
Damian Hobson-Garcia <dhobsong@igel.co.jp>
|
|
David Brownell <david-b@pacbell.net>
|
|
David Woodhouse <dwmw2@shinybook.infradead.org>
|
|
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
|
|
Domen Puncer <domen@coderock.org>
|
|
Douglas Gilbert <dougg@torque.net>
|
|
Ed L. Cashin <ecashin@coraid.com>
|
|
Evgeniy Polyakov <johnpol@2ka.mipt.ru>
|
|
Felipe W Damasio <felipewd@terra.com.br>
|
|
Felix Kuhling <fxkuehl@gmx.de>
|
|
Felix Moeller <felix@derklecks.de>
|
|
Filipe Lautert <filipe@icewall.org>
|
|
Franck Bui-Huu <vagabon.xyz@gmail.com>
|
|
Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
|
|
Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
|
|
Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
|
|
Frank Zago <fzago@systemfabricworks.com>
|
|
Greg Kroah-Hartman <greg@echidna.(none)>
|
|
Greg Kroah-Hartman <gregkh@suse.de>
|
|
Greg Kroah-Hartman <greg@kroah.com>
|
|
Henk Vergonet <Henk.Vergonet@gmail.com>
|
|
Henrik Kretzschmar <henne@nachtwindheim.de>
|
|
Henrik Rydberg <rydberg@bitmath.org>
|
|
Herbert Xu <herbert@gondor.apana.org.au>
|
|
Jacob Shin <Jacob.Shin@amd.com>
|
|
James Bottomley <jejb@mulgrave.(none)>
|
|
James Bottomley <jejb@titanic.il.steeleye.com>
|
|
James E Wilson <wilson@specifix.com>
|
|
James Ketrenos <jketreno@io.(none)>
|
|
<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
|
|
Jean Tourrilhes <jt@hpl.hp.com>
|
|
Jeff Garzik <jgarzik@pretzel.yyz.us>
|
|
Jens Axboe <axboe@suse.de>
|
|
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
|
|
John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
|
|
John Stultz <johnstul@us.ibm.com>
|
|
<josh@joshtriplett.org> <josh@freedesktop.org>
|
|
<josh@joshtriplett.org> <josh@kernel.org>
|
|
<josh@joshtriplett.org> <josht@linux.vnet.ibm.com>
|
|
<josh@joshtriplett.org> <josht@us.ibm.com>
|
|
<josh@joshtriplett.org> <josht@vnet.ibm.com>
|
|
Juha Yrjola <at solidboot.com>
|
|
Juha Yrjola <juha.yrjola@nokia.com>
|
|
Juha Yrjola <juha.yrjola@solidboot.com>
|
|
Kay Sievers <kay.sievers@vrfy.org>
|
|
Kenneth W Chen <kenneth.w.chen@intel.com>
|
|
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
|
|
Koushik <raghavendra.koushik@neterion.com>
|
|
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
|
|
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> <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>
|
|
Michael Buesch <m@bues.ch>
|
|
Michel Dänzer <michel@tungstengraphics.com>
|
|
Mitesh shah <mshah@teja.com>
|
|
Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
|
|
Morten Welinder <terra@gnome.org>
|
|
Morten Welinder <welinder@anemone.rentec.com>
|
|
Morten Welinder <welinder@darter.rentec.com>
|
|
Morten Welinder <welinder@troll.com>
|
|
Mythri P K <mythripk@ti.com>
|
|
Nguyen Anh Quynh <aquynh@gmail.com>
|
|
Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
|
|
Patrick Mochel <mochel@digitalimplant.org>
|
|
Peter A Jonsson <pj@ludd.ltu.se>
|
|
Peter Oruba <peter@oruba.de>
|
|
Peter Oruba <peter.oruba@amd.com>
|
|
Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
|
|
Praveen BP <praveenbp@ti.com>
|
|
Rajesh Shah <rajesh.shah@intel.com>
|
|
Ralf Baechle <ralf@linux-mips.org>
|
|
Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
|
|
Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
|
|
Rémi Denis-Courmont <rdenis@simphalempin.com>
|
|
Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
|
|
Rudolf Marek <R.Marek@sh.cvut.cz>
|
|
Rui Saraiva <rmps@joel.ist.utl.pt>
|
|
Sachin P Sant <ssant@in.ibm.com>
|
|
Sam Ravnborg <sam@mars.ravnborg.org>
|
|
Santosh Shilimkar <ssantosh@kernel.org>
|
|
Santosh Shilimkar <santosh.shilimkar@oracle.org>
|
|
Sascha Hauer <s.hauer@pengutronix.de>
|
|
S.Çağlar Onur <caglar@pardus.org.tr>
|
|
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
|
|
Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
|
|
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
|
|
Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
|
|
Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
|
|
Simon Kelley <simon@thekelleys.org.uk>
|
|
Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
|
|
Stephen Hemminger <shemminger@osdl.org>
|
|
Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
|
|
Sumit Semwal <sumit.semwal@ti.com>
|
|
Tejun Heo <htejun@gmail.com>
|
|
Thomas Graf <tgraf@suug.ch>
|
|
Tony Luck <tony.luck@intel.com>
|
|
Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
|
|
Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
|
|
Uwe Kleine-König <ukl@pengutronix.de>
|
|
Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
|
|
Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
|
|
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
|
|
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
|
|
Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
|
|
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
|
|
Yusuke Goda <goda.yusuke@renesas.com>
|
|
Gustavo Padovan <gustavo@las.ic.unicamp.br>
|
|
Gustavo Padovan <padovan@profusion.mobi>
|