Merge tag 'microblaze-v5.5-rc1' of git://git.monstr.eu/linux-2.6-microblaze
[sfrench/cifs-2.6.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 Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@intel.com>
20 Alex Shi <alex.shi@linux.alibaba.com> <alex.shi@linaro.org>
21 Alexei Starovoitov <ast@kernel.org> <ast@plumgrid.com>
22 Alexei Starovoitov <ast@kernel.org> <alexei.starovoitov@gmail.com>
23 Alexei Starovoitov <ast@kernel.org> <ast@fb.com>
24 Al Viro <viro@ftp.linux.org.uk>
25 Al Viro <viro@zenIV.linux.org.uk>
26 Andi Shyti <andi@etezian.org> <andi.shyti@samsung.com>
27 Andreas Herrmann <aherrman@de.ibm.com>
28 Andrey Ryabinin <ryabinin.a.a@gmail.com> <a.ryabinin@samsung.com>
29 Andrew Morton <akpm@linux-foundation.org>
30 Andrew Vasquez <andrew.vasquez@qlogic.com>
31 Andy Adamson <andros@citi.umich.edu>
32 Antoine Tenart <antoine.tenart@free-electrons.com>
33 Antonio Ospite <ao2@ao2.it> <ao2@amarulasolutions.com>
34 Archit Taneja <archit@ti.com>
35 Ard Biesheuvel <ardb@kernel.org> <ard.biesheuvel@linaro.org>
36 Arnaud Patard <arnaud.patard@rtp-net.org>
37 Arnd Bergmann <arnd@arndb.de>
38 Axel Dyks <xl@xlsigned.net>
39 Axel Lin <axel.lin@gmail.com>
40 Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
41 Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
42 Ben Gardner <bgardner@wabtec.com>
43 Ben M Cahill <ben.m.cahill@intel.com>
44 Björn Steinbrink <B.Steinbrink@gmx.de>
45 Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
46 Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
47 Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>
48 Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>
49 Brian Avery <b.avery@hp.com>
50 Brian King <brking@us.ibm.com>
51 Chao Yu <chao@kernel.org> <chao2.yu@samsung.com>
52 Chao Yu <chao@kernel.org> <yuchao0@huawei.com>
53 Christoph Hellwig <hch@lst.de>
54 Christophe Ricard <christophe.ricard@gmail.com>
55 Corey Minyard <minyard@acm.org>
56 Damian Hobson-Garcia <dhobsong@igel.co.jp>
57 Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
58 Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
59 Daniel Borkmann <daniel@iogearbox.net> <danborkmann@iogearbox.net>
60 Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
61 Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>
62 Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
63 David Brownell <david-b@pacbell.net>
64 David Woodhouse <dwmw2@shinybook.infradead.org>
65 Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
66 Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
67 Dengcheng Zhu <dzhu@wavecomp.com> <dczhu@mips.com>
68 Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
69 <dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
70 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
71 Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>
72 Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>
73 Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>
74 Domen Puncer <domen@coderock.org>
75 Douglas Gilbert <dougg@torque.net>
76 Ed L. Cashin <ecashin@coraid.com>
77 Evgeniy Polyakov <johnpol@2ka.mipt.ru>
78 Felipe W Damasio <felipewd@terra.com.br>
79 Felix Kuhling <fxkuehl@gmx.de>
80 Felix Moeller <felix@derklecks.de>
81 Filipe Lautert <filipe@icewall.org>
82 Franck Bui-Huu <vagabon.xyz@gmail.com>
83 Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
84 Frank Rowand <frowand.list@gmail.com> <frank.rowand@am.sony.com>
85 Frank Rowand <frowand.list@gmail.com> <frank.rowand@sonymobile.com>
86 Frank Zago <fzago@systemfabricworks.com>
87 Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
88 Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
89 Greg Kroah-Hartman <greg@echidna.(none)>
90 Greg Kroah-Hartman <gregkh@suse.de>
91 Greg Kroah-Hartman <greg@kroah.com>
92 Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>
93 Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>
94 Henk Vergonet <Henk.Vergonet@gmail.com>
95 Henrik Kretzschmar <henne@nachtwindheim.de>
96 Henrik Rydberg <rydberg@bitmath.org>
97 Herbert Xu <herbert@gondor.apana.org.au>
98 Jacob Shin <Jacob.Shin@amd.com>
99 Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@google.com>
100 Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk@motorola.com>
101 Jaegeuk Kim <jaegeuk@kernel.org> <jaegeuk.kim@samsung.com>
102 James Bottomley <jejb@mulgrave.(none)>
103 James Bottomley <jejb@titanic.il.steeleye.com>
104 James E Wilson <wilson@specifix.com>
105 James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
106 James Hogan <jhogan@kernel.org> <james@albanarts.com>
107 James Ketrenos <jketreno@io.(none)>
108 Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
109 Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
110 Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
111 <javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
112 Jayachandran C <c.jayachandran@gmail.com> <jayachandranc@netlogicmicro.com>
113 Jayachandran C <c.jayachandran@gmail.com> <jchandra@broadcom.com>
114 Jayachandran C <c.jayachandran@gmail.com> <jchandra@digeo.com>
115 Jayachandran C <c.jayachandran@gmail.com> <jnair@caviumnetworks.com>
116 Jean Tourrilhes <jt@hpl.hp.com>
117 <jean-philippe@linaro.org> <jean-philippe.brucker@arm.com>
118 Jeff Garzik <jgarzik@pretzel.yyz.us>
119 Jeff Layton <jlayton@kernel.org> <jlayton@redhat.com>
120 Jeff Layton <jlayton@kernel.org> <jlayton@poochiereds.net>
121 Jeff Layton <jlayton@kernel.org> <jlayton@primarydata.com>
122 Jens Axboe <axboe@suse.de>
123 Jens Osterkamp <Jens.Osterkamp@de.ibm.com>
124 Johan Hovold <johan@kernel.org> <jhovold@gmail.com>
125 Johan Hovold <johan@kernel.org> <johan@hovoldconsulting.com>
126 John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
127 John Stultz <johnstul@us.ibm.com>
128 <josh@joshtriplett.org> <josh@freedesktop.org>
129 <josh@joshtriplett.org> <josh@kernel.org>
130 <josh@joshtriplett.org> <josht@linux.vnet.ibm.com>
131 <josh@joshtriplett.org> <josht@us.ibm.com>
132 <josh@joshtriplett.org> <josht@vnet.ibm.com>
133 Juha Yrjola <at solidboot.com>
134 Juha Yrjola <juha.yrjola@nokia.com>
135 Juha Yrjola <juha.yrjola@solidboot.com>
136 Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
137 Kay Sievers <kay.sievers@vrfy.org>
138 Kenneth W Chen <kenneth.w.chen@intel.com>
139 Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
140 Koushik <raghavendra.koushik@neterion.com>
141 Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
142 Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
143 Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
144 Leon Romanovsky <leon@kernel.org> <leon@leon.nu>
145 Leon Romanovsky <leon@kernel.org> <leonro@mellanox.com>
146 Leonid I Ananiev <leonid.i.ananiev@intel.com>
147 Linas Vepstas <linas@austin.ibm.com>
148 Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
149 Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
150 Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
151 Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
152 Maciej W. Rozycki <macro@mips.com> <macro@imgtec.com>
153 Marc Zyngier <maz@kernel.org> <marc.zyngier@arm.com>
154 Marcin Nowakowski <marcin.nowakowski@mips.com> <marcin.nowakowski@imgtec.com>
155 Mark Brown <broonie@sirena.org.uk>
156 Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
157 Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
158 Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
159 Mathieu Othacehe <m.othacehe@gmail.com>
160 Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
161 Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>
162 Matthew Wilcox <willy@infradead.org> <mawilcox@linuxonhyperv.com>
163 Matthew Wilcox <willy@infradead.org> <mawilcox@microsoft.com>
164 Matthew Wilcox <willy@infradead.org> <willy@debian.org>
165 Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>
166 Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>
167 Matthieu CASTET <castet.matthieu@free.fr>
168 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
169 Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>
170 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@infradead.org>
171 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@redhat.com>
172 Mauro Carvalho Chehab <mchehab@kernel.org> <m.chehab@samsung.com>
173 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
174 Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
175 Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
176 Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
177 Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
178 Matt Redfearn <matt.redfearn@mips.com> <matt.redfearn@imgtec.com>
179 Maxime Ripard <mripard@kernel.org> <maxime.ripard@bootlin.com>
180 Maxime Ripard <mripard@kernel.org> <maxime.ripard@free-electrons.com>
181 Mayuresh Janorkar <mayur@ti.com>
182 Michael Buesch <m@bues.ch>
183 Michel Dänzer <michel@tungstengraphics.com>
184 Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
185 Miquel Raynal <miquel.raynal@bootlin.com> <miquel.raynal@free-electrons.com>
186 Mitesh shah <mshah@teja.com>
187 Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
188 Morten Welinder <terra@gnome.org>
189 Morten Welinder <welinder@anemone.rentec.com>
190 Morten Welinder <welinder@darter.rentec.com>
191 Morten Welinder <welinder@troll.com>
192 Mythri P K <mythripk@ti.com>
193 Nguyen Anh Quynh <aquynh@gmail.com>
194 Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>
195 Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
196 Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
197 Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
198 Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
199 Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>
200 Oleksij Rempel <linux@rempel-privat.de> <o.rempel@pengutronix.de>
201 Oleksij Rempel <linux@rempel-privat.de> <ore@pengutronix.de>
202 Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
203 Patrick Mochel <mochel@digitalimplant.org>
204 Paul Burton <paulburton@kernel.org> <paul.burton@imgtec.com>
205 Paul Burton <paulburton@kernel.org> <paul.burton@mips.com>
206 Peter A Jonsson <pj@ludd.ltu.se>
207 Peter Oruba <peter@oruba.de>
208 Peter Oruba <peter.oruba@amd.com>
209 Pratyush Anand <pratyush.anand@gmail.com> <pratyush.anand@st.com>
210 Praveen BP <praveenbp@ti.com>
211 Punit Agrawal <punitagrawal@gmail.com> <punit.agrawal@arm.com>
212 Qais Yousef <qsyousef@gmail.com> <qais.yousef@imgtec.com>
213 Quentin Perret <qperret@qperret.net> <quentin.perret@arm.com>
214 Rajesh Shah <rajesh.shah@intel.com>
215 Ralf Baechle <ralf@linux-mips.org>
216 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
217 Randy Dunlap <rdunlap@infradead.org> <rdunlap@xenotime.net>
218 Rémi Denis-Courmont <rdenis@simphalempin.com>
219 Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
220 Ross Zwisler <zwisler@kernel.org> <ross.zwisler@linux.intel.com>
221 Rudolf Marek <R.Marek@sh.cvut.cz>
222 Rui Saraiva <rmps@joel.ist.utl.pt>
223 Sachin P Sant <ssant@in.ibm.com>
224 Sarangdhar Joshi <spjoshi@codeaurora.org>
225 Sam Ravnborg <sam@mars.ravnborg.org>
226 Santosh Shilimkar <ssantosh@kernel.org>
227 Santosh Shilimkar <santosh.shilimkar@oracle.org>
228 Sascha Hauer <s.hauer@pengutronix.de>
229 S.Çağlar Onur <caglar@pardus.org.tr>
230 Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
231 Sebastian Reichel <sre@kernel.org> <sre@debian.org>
232 Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
233 Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
234 Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
235 Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
236 Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
237 Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
238 Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
239 Simon Kelley <simon@thekelleys.org.uk>
240 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
241 Stephen Hemminger <shemminger@osdl.org>
242 Subash Abhinov Kasiviswanathan <subashab@codeaurora.org>
243 Subhash Jadavani <subhashj@codeaurora.org>
244 Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
245 Sumit Semwal <sumit.semwal@ti.com>
246 Tejun Heo <htejun@gmail.com>
247 Thomas Graf <tgraf@suug.ch>
248 Thomas Pedersen <twp@codeaurora.org>
249 Todor Tomov <todor.too@gmail.com> <todor.tomov@linaro.org>
250 Tony Luck <tony.luck@intel.com>
251 TripleX Chung <xxx.phy@gmail.com> <zhongyu@18mail.cn>
252 TripleX Chung <xxx.phy@gmail.com> <triplex@zh-kernel.org>
253 Tsuneo Yoshioka <Tsuneo.Yoshioka@f-secure.com>
254 Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
255 Uwe Kleine-König <ukl@pengutronix.de>
256 Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
257 Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
258 Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
259 Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
260 Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>
261 Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
262 Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
263 Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
264 Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
265 Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
266 Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
267 Takashi YOSHII <takashi.yoshii.zj@renesas.com>
268 Will Deacon <will@kernel.org> <will.deacon@arm.com>
269 Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
270 Yusuke Goda <goda.yusuke@renesas.com>
271 Gustavo Padovan <gustavo@las.ic.unicamp.br>
272 Gustavo Padovan <padovan@profusion.mobi>
273 Changbin Du <changbin.du@intel.com> <changbin.du@intel.com>
274 Changbin Du <changbin.du@intel.com> <changbin.du@gmail.com>