Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[platform/kernel/linux-rpi.git] / .mailmap
1 #
2 # This list is used by git-shortlog to fix a few botched name translations
3 # in the git archive, either because the author's full name was messed up
4 # and/or not always written the same way, making contributions from the
5 # same person appearing not to be so or badly displayed.
6 #
7 # repo-abbrev: /pub/scm/linux/kernel/git/
8 #
9
10 Aaron Durbin <adurbin@google.com>
11 Adam Oldham <oldhamca@gmail.com>
12 Adam Radford <aradford@gmail.com>
13 Adrian Bunk <bunk@stusta.de>
14 Adriana Reus <adi.reus@gmail.com> <adriana.reus@intel.com>
15 Alan Cox <alan@lxorguk.ukuu.org.uk>
16 Alan Cox <root@hraefn.swansea.linux.org.uk>
17 Aleksey Gorelov <aleksey_gorelov@phoenix.com>
18 Aleksandar Markovic <aleksandar.markovic@mips.com> <aleksandar.markovic@imgtec.com>
19 Al Viro <viro@ftp.linux.org.uk>
20 Al Viro <viro@zenIV.linux.org.uk>
21 Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
22 Andreas Herrmann <aherrman@de.ibm.com>
23 Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
24 Andrew Morton <akpm@linux-foundation.org>
25 Andrew Vasquez <andrew.vasquez@qlogic.com>
26 Andy Adamson <andros@citi.umich.edu>
27 Antoine Tenart <antoine.tenart@free-electrons.com>
28 Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
29 Archit Taneja <archit@ti.com>
30 Arnaud Patard <arnaud.patard@rtp-net.org>
31 Arnd Bergmann <arnd@arndb.de>
32 Axel Dyks <xl@xlsigned.net>
33 Axel Lin <axel.lin@gmail.com>
34 Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
35 Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
36 Ben Gardner <bgardner@wabtec.com>
37 Ben M Cahill <ben.m.cahill@intel.com>
38 Björn Steinbrink <B.Steinbrink@gmx.de>
39 Boris Brezillon <boris.brezillon@bootlin.com> <boris.brezillon@free-electrons.com>
40 Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon.dev@gmail.com>
41 Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon@overkiz.com>
42 Brian Avery <b.avery@hp.com>
43 Brian King <brking@us.ibm.com>
44 Christoph Hellwig <hch@lst.de>
45 Christophe Ricard <christophe.ricard@gmail.com>
46 Corey Minyard <minyard@acm.org>
47 Damian Hobson-Garcia <dhobsong@igel.co.jp>
48 David Brownell <david-b@pacbell.net>
49 David Woodhouse <dwmw2@shinybook.infradead.org>
50 Deng-Cheng Zhu <dengcheng.zhu@mips.com> <dengcheng.zhu@imgtec.com>
51 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
52 Domen Puncer <domen@coderock.org>
53 Douglas Gilbert <dougg@torque.net>
54 Ed L. Cashin <ecashin@coraid.com>
55 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
56 Felipe W Damasio <felipewd@terra.com.br>
57 Felix Kuhling <fxkuehl@gmx.de>
58 Felix Moeller <felix@derklecks.de>
59 Filipe Lautert <filipe@icewall.org>
60 Franck Bui-Huu <vagabon.xyz@gmail.com>
61 Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
62 Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
63 Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
64 Frank Zago <fzago@systemfabricworks.com>
65 Greg Kroah-Hartman <greg@echidna.(none)>
66 Greg Kroah-Hartman <gregkh@suse.de>
67 Greg Kroah-Hartman <greg@kroah.com>
68 Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
69 Henk Vergonet <Henk.Vergonet@gmail.com>
70 Henrik Kretzschmar <henne@nachtwindheim.de>
71 Henrik Rydberg <rydberg@bitmath.org>
72 Herbert Xu <herbert@gondor.apana.org.au>
73 Jacob Shin <Jacob.Shin@amd.com>
74 James Bottomley <jejb@mulgrave.(none)>
75 James Bottomley <jejb@titanic.il.steeleye.com>
76 James E Wilson <wilson@specifix.com>
77 James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
78 James Hogan <jhogan@kernel.org> <james@albanarts.com>
79 James Ketrenos <jketreno@io.(none)>
80 Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
81 Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
82 Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
83 <javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
84 Jean Tourrilhes <jt@hpl.hp.com>
85 Jeff Garzik <jgarzik@pretzel.yyz.us>
86 Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
87 Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
88 Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>
89 Jens Axboe <axboe@suse.de>
90 Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
91 Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
92 Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
93 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
94 John Stultz <johnstul@us.ibm.com>
95 <josh@joshtriplett.org> <josh@freedesktop.org>
96 <josh@joshtriplett.org> <josh@kernel.org>
97 <josh@joshtriplett.org> <josht@linux.vnet.ibm.com>
98 <josh@joshtriplett.org> <josht@us.ibm.com>
99 <josh@joshtriplett.org> <josht@vnet.ibm.com>
100 Juha Yrjola <at solidboot.com>
101 Juha Yrjola <juha.yrjola@nokia.com>
102 Juha Yrjola <juha.yrjola@solidboot.com>
103 Kay Sievers <kay.sievers@vrfy.org>
104 Kenneth W Chen <kenneth.w.chen@intel.com>
105 Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
106 Koushik <raghavendra.koushik@neterion.com>
107 Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
108 Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
109 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
110 Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
111 Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
112 Leonid I Ananiev <leonid.i.ananiev@intel.com>
113 Linas Vepstas <linas@austin.ibm.com>
114 Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
115 Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
116 Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
117 Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
118 Mark Brown <broonie@sirena.org.uk>
119 Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
120 Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
121 Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
122 Matthieu CASTET <castet.matthieu@free.fr>
123 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
124 Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
125 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org>
126 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
127 Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
128 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
129 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
130 Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
131 Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
132 Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
133 Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
134 Mayuresh Janorkar <mayur@ti.com>
135 Michael Buesch <m@bues.ch>
136 Michel Dänzer <michel@tungstengraphics.com>
137 Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
138 Miquel Raynal <miquel.raynal@bootlin.com> <miquel.raynal@free-electrons.com>
139 Mitesh shah <mshah@teja.com>
140 Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
141 Morten Welinder <terra@gnome.org>
142 Morten Welinder <welinder@anemone.rentec.com>
143 Morten Welinder <welinder@darter.rentec.com>
144 Morten Welinder <welinder@troll.com>
145 Mythri P K <mythripk@ti.com>
146 Nguyen Anh Quynh <aquynh@gmail.com>
147 Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
148 Patrick Mochel <mochel@digitalimplant.org>
149 Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
150 Peter A Jonsson <pj@ludd.ltu.se>
151 Peter Oruba <peter@oruba.de>
152 Peter Oruba <peter.oruba@amd.com>
153 Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
154 Praveen BP <praveenbp@ti.com>
155 Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
156 Rajesh Shah <rajesh.shah@intel.com>
157 Ralf Baechle <ralf@linux-mips.org>
158 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
159 Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
160 Rémi Denis-Courmont <rdenis@simphalempin.com>
161 Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
162 Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
163 Rudolf Marek <R.Marek@sh.cvut.cz>
164 Rui Saraiva <rmps@joel.ist.utl.pt>
165 Sachin P Sant <ssant@in.ibm.com>
166 Sarangdhar Joshi <spjoshi@codeaurora.org>
167 Sam Ravnborg <sam@mars.ravnborg.org>
168 Santosh Shilimkar <ssantosh@kernel.org>
169 Santosh Shilimkar <santosh.shilimkar@oracle.org>
170 Sascha Hauer <s.hauer@pengutronix.de>
171 S.Çağlar Onur <caglar@pardus.org.tr>
172 Sebastian Reichel <sre@kernel.org> <sre@debian.org>
173 Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
174 Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
175 Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
176 Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
177 Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
178 Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
179 Simon Kelley <simon@thekelleys.org.uk>
180 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
181 Stephen Hemminger <shemminger@osdl.org>
182 Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
183 Subhash Jadavani <subhashj@codeaurora.org>
184 Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
185 Sumit Semwal <sumit.semwal@ti.com>
186 Tejun Heo <htejun@gmail.com>
187 Thomas Graf <tgraf@suug.ch>
188 Thomas Pedersen <twp@codeaurora.org>
189 Tony Luck <tony.luck@intel.com>
190 Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
191 Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
192 Uwe Kleine-König <ukl@pengutronix.de>
193 Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
194 Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
195 Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
196 Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
197 Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>
198 Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
199 Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
200 Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
201 Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
202 Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
203 Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
204 Takashi YOSHII <takashi.yoshii.zj@renesas.com>
205 Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
206 Yusuke Goda <goda.yusuke@renesas.com>
207 Gustavo Padovan <gustavo@las.ic.unicamp.br>
208 Gustavo Padovan <padovan@profusion.mobi>