bef3352b0d3c6e84a33304b2fe44f6a68f6044a3
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.
6#
7<nico@fluxnic.net> <nico@cam.org>
9Alejandro R. Sedeño <asedeno@MIT.EDU> <asedeno@mit.edu>
10Alex Bennée <kernel-hacker@bennee.com>
11Alex Riesen <raa.lkml@gmail.com> <fork0@t-online.de>
12Alex Riesen <raa.lkml@gmail.com> <raa@limbo.localdomain>
13Alex Riesen <raa.lkml@gmail.com> <raa@steel.home>
14Alex Vandiver <alex@chmrr.net> <alexmv@MIT.EDU>
15Alexander Gavrilov <angavrilov@gmail.com>
16Alexander Kuleshov <kuleshovmail@gmail.com>
17Alexey Shumkin <alex.crezoff@gmail.com> <zapped@mail.ru>
18Alexey Shumkin <alex.crezoff@gmail.com> <Alex.Crezoff@gmail.com>
19Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
20Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
21Aneesh Kumar K.V <aneesh.kumar@gmail.com>
22Amos Waterland <apw@debian.org> <apw@rossby.metr.ou.edu>
23Amos Waterland <apw@debian.org> <apw@us.ibm.com>
24Ben Walton <bdwalton@gmail.com> <bwalton@artsci.utoronto.ca>
25Benoit Sigoure <tsunanet@gmail.com> <tsuna@lrde.epita.fr>
26Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
27Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
28brian m. carlson <sandals@crustytoothpaste.net>
29brian m. carlson <sandals@crustytoothpaste.net> <sandals@crustytoothpaste.ath.cx>
30Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>
31Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
32Cheng Renquan <crquan@gmail.com>
33Chris Shoemaker <c.shoemaker@cox.net>
34Chris Wright <chrisw@sous-sol.org> <chrisw@osdl.org>
35Cord Seele <cowose@gmail.com> <cowose@googlemail.com>
36Christian Couder <chriscool@tuxfamily.org> <christian.couder@gmail.com>
37Christian Stimming <stimming@tuhh.de> <chs@ckiste.goetheallee>
38Christopher Díaz Riveros <chrisadr@gentoo.org> Christopher Diaz Riveros
39Csaba Henk <csaba@gluster.com> <csaba@lowlife.hu>
40Dan Johnson <computerdruid@gmail.com>
41Dana L. How <danahow@gmail.com> <how@deathvalley.cswitch.com>
42Dana L. How <danahow@gmail.com> Dana How
43Daniel Barkalow <barkalow@iabervon.org>
44Daniel Knittl-Frank <knittl89@googlemail.com> knittl
45Daniel Trstenjak <daniel.trstenjak@gmail.com> <daniel.trstenjak@online.de>
46Daniel Trstenjak <daniel.trstenjak@gmail.com> <trsten@science-computing.de>
47David Brown <git@davidb.org> <davidb@quicinc.com>
48David D. Kilzer <ddkilzer@kilzer.net>
49David Kågedal <davidk@lysator.liu.se>
50David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
51David S. Miller <davem@davemloft.net>
52David Turner <novalis@novalis.org> <dturner@twopensource.com>
53David Turner <novalis@novalis.org> <dturner@twosigma.com>
54Deskin Miller <deskinm@umich.edu>
55Dirk Süsserott <newsletter@dirk.my1.cc>
56Eric Blake <eblake@redhat.com> <ebb9@byu.net>
57Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net>
58Eric S. Raymond <esr@thyrsus.com>
59Eric Wong <e@80x24.org> <normalperson@yhbt.net>
60Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
61Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> <eyvind-git@orakel.ntnu.no>
62Fangyi Zhou <fangyi.zhou@yuriko.moe> Zhou Fangyi
63Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.31@gmail.com>
64Franck Bui-Huu <vagabon.xyz@gmail.com> <fbuihuu@gmail.com>
65Frank Lichtenheld <frank@lichtenheld.de> <djpig@debian.org>
66Frank Lichtenheld <frank@lichtenheld.de> <flichtenheld@astaro.com>
67Fredrik Kuivinen <frekui@gmail.com> <freku045@student.liu.se>
68Frédéric Heitzmann <frederic.heitzmann@gmail.com>
69Garry Dolley <gdolley@ucla.edu> <gdolley@arpnetworks.com>
70Greg Price <price@mit.edu> <price@MIT.EDU>
71Greg Price <price@mit.edu> <price@ksplice.com>
72Heiko Voigt <hvoigt@hvoigt.net> <git-list@hvoigt.net>
73H. Merijn Brand <h.m.brand@xs4all.nl> H.Merijn Brand <h.m.brand@xs4all.nl>
74H. Peter Anvin <hpa@zytor.com> <hpa@bonde.sc.orionmulti.com>
75H. Peter Anvin <hpa@zytor.com> <hpa@smyrno.hos.anvin.org>
76H. Peter Anvin <hpa@zytor.com> <hpa@tazenda.sc.orionmulti.com>
77H. Peter Anvin <hpa@zytor.com> <hpa@trantor.hos.anvin.org>
78Han-Wen Nienhuys <hanwen@google.com> Han-Wen Nienhuys <hanwen@xs4all.nl>
79Horst H. von Brand <vonbrand@inf.utfsm.cl>
80J. Bruce Fields <bfields@citi.umich.edu> <bfields@fieldses.org>
81J. Bruce Fields <bfields@citi.umich.edu> <bfields@pig.linuxdev.us.dell.com>
82J. Bruce Fields <bfields@citi.umich.edu> <bfields@puzzle.fieldses.org>
83Jakub Narębski <jnareb@gmail.com>
84James Y Knight <jknight@itasoftware.com> <foom@fuhm.net>
85# The 2 following authors are probably the same person,
86# but both emails bounce.
87Jason McMullan <jason.mcmullan@timesys.com>
88Jason McMullan <mcmullan@netapp.com>
89Jason Riedy <ejr@eecs.berkeley.edu> <ejr@EECS.Berkeley.EDU>
90Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
91Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
92Jean-Noël Avila <jn.avila@free.fr> Jean-Noel Avila
93Jean-Noël Avila <jn.avila@free.fr> Jean-Noël AVILA
94Jeff King <peff@peff.net> <peff@github.com>
95Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
96Jens Axboe <axboe@kernel.dk> <axboe@suse.de>
97Jens Axboe <axboe@kernel.dk> <jens.axboe@oracle.com>
98Jens Lindström <jl@opera.com> Jens Lindstrom <jl@opera.com>
99Jim Meyering <jim@meyering.net> <meyering@redhat.com>
100Joachim Berdal Haga <cjhaga@fys.uio.no>
101Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
102Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
103Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
104Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
105John 'Warthog9' Hawley <warthog9@kernel.org> <warthog9@eaglescrag.net>
106Jon Loeliger <jdl@jdl.com> <jdl@freescale.com>
107Jon Loeliger <jdl@jdl.com> <jdl@freescale.org>
108Jon Seymour <jon.seymour@gmail.com> <jon@blackcubes.dyndns.org>
109Jonathan Nieder <jrnieder@gmail.com> <jrnieder@uchicago.edu>
110Jonathan del Strother <jon.delStrother@bestbefore.tv> <maillist@steelskies.com>
111Josh Triplett <josh@joshtriplett.org> <josh@freedesktop.org>
112Josh Triplett <josh@joshtriplett.org> <josht@us.ibm.com>
113Julian Phillips <julian@quantumfyre.co.uk> <jp3@quantumfyre.co.uk>
114Junio C Hamano <gitster@pobox.com> <gitster@pobox.com>
115Junio C Hamano <gitster@pobox.com> <junio@hera.kernel.org>
116Junio C Hamano <gitster@pobox.com> <junio@kernel.org>
117Junio C Hamano <gitster@pobox.com> <junio@pobox.com>
118Junio C Hamano <gitster@pobox.com> <junio@twinsun.com>
119Junio C Hamano <gitster@pobox.com> <junkio@cox.net>
120Junio C Hamano <gitster@pobox.com> <junkio@twinsun.com>
121Kaartic Sivaraam <kaartic.sivaraam@gmail.com> <kaarticsivaraam91196@gmail.com>
122Karl Wiberg <kha@treskal.com> Karl Hasselström
123Karl Wiberg <kha@treskal.com> <kha@yoghurt.hemma.treskal.com>
124Karsten Blees <blees@dcon.de> <karsten.blees@dcon.de>
125Karsten Blees <blees@dcon.de> <karsten.blees@gmail.com>
126Kay Sievers <kay.sievers@vrfy.org> <kay.sievers@suse.de>
127Kay Sievers <kay.sievers@vrfy.org> <kay@mam.(none)>
128Kazuki Saitoh <ksaitoh560@gmail.com> kazuki saitoh <ksaitoh560@gmail.com>
129Keith Cascio <keith@CS.UCLA.EDU> <keith@cs.ucla.edu>
130Kent Engstrom <kent@lysator.liu.se>
131Kevin Leung <kevinlsk@gmail.com>
132Kirill Smelkov <kirr@navytux.spb.ru> <kirr@landau.phys.spbu.ru>
133Kirill Smelkov <kirr@navytux.spb.ru> <kirr@mns.spb.ru>
134Knut Franke <Knut.Franke@gmx.de> <k.franke@science-computing.de>
135Lars Doelle <lars.doelle@on-line ! de>
136Lars Doelle <lars.doelle@on-line.de>
137Lars Noschinski <lars@public.noschinski.de> <lars.noschinski@rwth-aachen.de>
138Li Hong <leehong@pku.edu.cn>
139Linus Torvalds <torvalds@linux-foundation.org> <torvalds@evo.osdl.org>
140Linus Torvalds <torvalds@linux-foundation.org> <torvalds@g5.osdl.org>
141Linus Torvalds <torvalds@linux-foundation.org> <torvalds@osdl.org>
142Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org.(none)>
143Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org>
144Linus Torvalds <torvalds@linux-foundation.org> <torvalds@woody.linux-foundation.org>
145Lukas Sandström <luksan@gmail.com> <lukass@etek.chalmers.se>
146Marc Khouzam <marc.khouzam@ericsson.com> <marc.khouzam@gmail.com>
147Marc-André Lureau <marcandre.lureau@gmail.com>
148Marco Costalba <mcostalba@gmail.com> <mcostalba@yahoo.it>
149Mark Levedahl <mdl123@verizon.net> <mlevedahl@gmail.com>
150Mark Rada <marada@uwaterloo.ca>
151Martin Langhoff <martin@laptop.org> <martin@catalyst.net.nz>
152Martin von Zweigbergk <martinvonz@gmail.com> <martin.von.zweigbergk@gmail.com>
153Matt Draisey <matt@draisey.ca> <mattdraisey@sympatico.ca>
154Matt Kraai <kraai@ftbfs.org> <matt.kraai@amo.abbott.com>
155Matt McCutchen <matt@mattmccutchen.net> <hashproduct@gmail.com>
156Matthias Kestenholz <matthias@spinlock.ch> <mk@spinlock.ch>
157Matthias Rüster <matthias.ruester@gmail.com> Matthias Ruester
158Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
159Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
160Michael Coleman <tutufan@gmail.com>
161Michael J Gruber <git@grubix.eu> <michaeljgruber+gmane@fastmail.fm>
162Michael J Gruber <git@grubix.eu> <git@drmicha.warpmail.net>
163Michael S. Tsirkin <mst@kernel.org> <mst@redhat.com>
164Michael S. Tsirkin <mst@kernel.org> <mst@mellanox.co.il>
165Michael S. Tsirkin <mst@kernel.org> <mst@dev.mellanox.co.il>
166Michael W. Olson <mwolson@gnu.org>
167Michael Witten <mfwitten@gmail.com> <mfwitten@MIT.EDU>
168Michael Witten <mfwitten@gmail.com> <mfwitten@mit.edu>
169Michal Rokos <michal.rokos@nextsoft.cz> <rokos@nextsoft.cz>
170Michele Ballabio <barra_cuda@katamail.com>
171Miklos Vajna <vmiklos@frugalware.org> <vmiklos@suse.cz>
172Namhyung Kim <namhyung@gmail.com> <namhyung.kim@lge.com>
173Namhyung Kim <namhyung@gmail.com> <namhyung@kernel.org>
174Nanako Shiraishi <nanako3@lavabit.com> <nanako3@bluebottle.com>
175Nanako Shiraishi <nanako3@lavabit.com>
176Nelson Elhage <nelhage@mit.edu> <nelhage@MIT.EDU>
177Nelson Elhage <nelhage@mit.edu> <nelhage@ksplice.com>
178Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
179Nick Stokoe <nick@noodlefactory.co.uk> Nick Woolley <nick@noodlefactory.co.uk>
180Nick Stokoe <nick@noodlefactory.co.uk> Nick Woolley <nickwoolley@yahoo.co.uk>
181Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com> <nicolas.morey@free.fr>
182Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com> <nmorey@kalray.eu>
183Nicolas Sebrecht <nicolas.s.dev@gmx.fr> <ni.s@laposte.net>
184Paolo Bonzini <bonzini@gnu.org> <paolo.bonzini@lu.unisi.ch>
185Pascal Obry <pascal@obry.net> <pascal.obry@gmail.com>
186Pascal Obry <pascal@obry.net> <pascal.obry@wanadoo.fr>
187Pat Notz <patnotz@gmail.com> <pknotz@sandia.gov>
188Patrick Steinhardt <ps@pks.im> <patrick.steinhardt@elego.de>
189Paul Mackerras <paulus@samba.org> <paulus@dorrigo.(none)>
190Paul Mackerras <paulus@samba.org> <paulus@pogo.(none)>
191Peter Baumann <waste.manager@gmx.de> <Peter.B.Baumann@stud.informatik.uni-erlangen.de>
192Peter Baumann <waste.manager@gmx.de> <siprbaum@stud.informatik.uni-erlangen.de>
193Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
194Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
195Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
196Petr Baudis <pasky@ucw.cz> <xpasky@machine>
197Phil Hord <hordp@cisco.com> <phil.hord@gmail.com>
198Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com>
199Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
200Philippe Bruhat <book@cpan.org>
201Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
202Ramsay Jones <ramsay@ramsayjones.plus.com> <ramsay@ramsay1.demon.co.uk>
203René Scharfe <l.s.r@web.de> <rene.scharfe@lsrfire.ath.cx>
204René Scharfe <l.s.r@web.de> Rene Scharfe
205Richard Hansen <rhansen@rhansen.org> <hansenr@google.com>
206Richard Hansen <rhansen@rhansen.org> <rhansen@bbn.com>
207Robert Fitzsimons <robfitz@273k.net>
208Robert Shearman <robertshearman@gmail.com> <rob@codeweavers.com>
209Robert Zeh <robert.a.zeh@gmail.com>
210Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
211Rutger Nijlunsing <rutger.nijlunsing@gmail.com> <rutger@nospam.com>
212Rutger Nijlunsing <rutger.nijlunsing@gmail.com> <git@tux.tmfweb.nl>
213Ryan Anderson <ryan@michonline.com> <rda@google.com>
214Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
215Sam Vilain <sam@vilain.net> <sam.vilain@catalyst.net.nz>
216Sam Vilain <sam@vilain.net> sam@vilain.net
217Santi Béjar <santi@agolina.net> <sbejar@gmail.com>
218Sean Estabrooks <seanlkml@sympatico.ca>
219Sebastian Schuberth <sschuberth@gmail.com> <sschuberth@visageimaging.com>
220Seth Falcon <seth@userprimary.net> <sfalcon@fhcrc.org>
221Shawn O. Pearce <spearce@spearce.org>
222Wei Shuyu <wsy@dogben.com> Shuyu Wei
223Sidhant Sharma <tigerkid001@gmail.com> Sidhant Sharma [:tk]
224Simon Hausmann <hausmann@kde.org> <simon@lst.de>
225Simon Hausmann <hausmann@kde.org> <shausman@trolltech.com>
226Stefan Beller <stefanbeller@gmail.com> <stefanbeller@googlemail.com>
227Stefan Beller <stefanbeller@gmail.com> <sbeller@google.com>
228Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@atlas-elektronik.com>
229Stefan Naewe <stefan.naewe@gmail.com> <stefan.naewe@googlemail.com>
230Stefan Sperling <stsp@elego.de> <stsp@stsp.name>
231Štěpán Němec <stepnem@gmail.com> <stepan.nemec@gmail.com>
232Stephen Boyd <bebarino@gmail.com> <sboyd@codeaurora.org>
233Steven Drake <sdrake@xnet.co.nz> <sdrake@ihug.co.nz>
234Steven Grimm <koreth@midwinter.com> <sgrimm@sgrimm-mbp.local>
235Steven Grimm <koreth@midwinter.com> koreth@midwinter.com
236Steven Walter <stevenrwalter@gmail.com> <swalter@lexmark.com>
237Steven Walter <stevenrwalter@gmail.com> <swalter@lpdev.prtdev.lexmark.com>
238Sven Verdoolaege <skimo@kotnet.org> <Sven.Verdoolaege@cs.kuleuven.ac.be>
239Sven Verdoolaege <skimo@kotnet.org> <skimo@liacs.nl>
240SZEDER Gábor <szeder.dev@gmail.com> <szeder@ira.uka.de>
241Tay Ray Chuan <rctay89@gmail.com>
242Ted Percival <ted@midg3t.net> <ted.percival@quest.com>
243Theodore Ts'o <tytso@mit.edu>
244Thomas Ackermann <th.acker@arcor.de> <th.acker66@arcor.de>
245Thomas Rast <tr@thomasrast.ch> <trast@student.ethz.ch>
246Thomas Rast <tr@thomasrast.ch> <trast@inf.ethz.ch>
247Thomas Rast <tr@thomasrast.ch> <trast@google.com>
248Timo Hirvonen <tihirvon@gmail.com> <tihirvon@ee.oulu.fi>
249Toby Allsopp <Toby.Allsopp@navman.co.nz> <toby.allsopp@navman.co.nz>
250Tom Grennan <tmgrennan@gmail.com> <tgrennan@redback.com>
251Tommi Virtanen <tv@debian.org> <tv@eagain.net>
252Tommi Virtanen <tv@debian.org> <tv@inoi.fi>
253Tommy Thorn <tommy-git@thorn.ws> <tt1729@yahoo.com>
254Tony Luck <tony.luck@intel.com>
255Tor Arne Vestbø <torarnv@gmail.com> <tavestbo@trolltech.com>
256Trần Ngọc Quân <vnwildman@gmail.com> Tran Ngoc Quan <vnwildman@gmail.com>
257Trent Piepho <tpiepho@gmail.com> <tpiepho@freescale.com>
258Trent Piepho <tpiepho@gmail.com> <xyzzy@speakeasy.org>
259Uwe Kleine-König <u.kleine-koenig@pengutronix.de> <Uwe.Kleine-Koenig@digi.com>
260Uwe Kleine-König <u.kleine-koenig@pengutronix.de> <ukleinek@informatik.uni-freiburg.de>
261Uwe Kleine-König <u.kleine-koenig@pengutronix.de> <uzeisberger@io.fsforth.de>
262Uwe Kleine-König <u.kleine-koenig@pengutronix.de> <zeisberg@informatik.uni-freiburg.de>
263Ville Skyttä <ville.skytta@iki.fi> <scop@xemacs.org>
264Vitaly "_Vi" Shukela <vi0oss@gmail.com> <public_vi@tut.by>
265Vitaly "_Vi" Shukela <vi0oss@gmail.com> Vitaly _Vi Shukela
266W. Trevor King <wking@tremily.us> <wking@drexel.edu>
267William Pursell <bill.pursell@gmail.com>
268YONETANI Tomokazu <y0n3t4n1@gmail.com> <qhwt+git@les.ath.cx>
269YONETANI Tomokazu <y0n3t4n1@gmail.com> <y0netan1@dragonflybsd.org>
270YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
271# the two anonymous contributors are different persons:
272anonymous <linux@horizon.com>
273anonymous <linux@horizon.net>
274İsmail Dönmez <ismail@pardus.org.tr>