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