22d3d7079180e071f92b25809cf8fac1df5a7f0b
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>
17Anders Kaseorg <andersk@MIT.EDU> <andersk@ksplice.com>
18Anders Kaseorg <andersk@MIT.EDU> <andersk@mit.edu>
19Aneesh Kumar K.V <aneesh.kumar@gmail.com>
20Bernt Hansen <bernt@norang.ca> <bernt@alumni.uwaterloo.ca>
21Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
22Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
23Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>
24Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
25Cheng Renquan <crquan@gmail.com>
26Chris Shoemaker <c.shoemaker@cox.net>
27Dan Johnson <computerdruid@gmail.com>
28Dana L. How <danahow@gmail.com>
29Dana L. How <how@deathvalley.cswitch.com>
30Daniel Barkalow <barkalow@iabervon.org>
31David Brown <git@davidb.org> <davidb@quicinc.com>
32David D. Kilzer <ddkilzer@kilzer.net>
33David Kågedal <davidk@lysator.liu.se>
34David Reiss <dreiss@facebook.com> <dreiss@dreiss-vmware.(none)>
35David S. Miller <davem@davemloft.net>
36Deskin Miller <deskinm@umich.edu>
37Dirk Süsserott <newsletter@dirk.my1.cc>
38Eric Blake <eblake@redhat.com> <ebb9@byu.net>
39Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net>
40Eric S. Raymond <esr@thyrsus.com>
41Erik Faye-Lund <kusmabite@gmail.com> <kusmabite@googlemail.com>
42Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com> <eyvind-git@orakel.ntnu.no>
43Florian Achleitner <florian.achleitner.2.6.31@gmail.com> <florian.achleitner2.6.31@gmail.com>
44Franck Bui-Huu <vagabon.xyz@gmail.com> <fbuihuu@gmail.com>
45Frank Lichtenheld <frank@lichtenheld.de> <djpig@debian.org>
46Frank Lichtenheld <frank@lichtenheld.de> <flichtenheld@astaro.com>
47Fredrik Kuivinen <freku045@student.liu.se>
48Frédéric Heitzmann <frederic.heitzmann@gmail.com>
49H. Merijn Brand <h.m.brand@xs4all.nl> H.Merijn Brand <h.m.brand@xs4all.nl>
50H. Peter Anvin <hpa@zytor.com> <hpa@bonde.sc.orionmulti.com>
51H. Peter Anvin <hpa@zytor.com> <hpa@smyrno.hos.anvin.org>
52H. Peter Anvin <hpa@zytor.com> <hpa@tazenda.sc.orionmulti.com>
53H. Peter Anvin <hpa@zytor.com> <hpa@trantor.hos.anvin.org>
54Han-Wen Nienhuys <hanwen@google.com> Han-Wen Nienhuys <hanwen@xs4all.nl>
55Horst H. von Brand <vonbrand@inf.utfsm.cl>
56J. Bruce Fields <bfields@citi.umich.edu> <bfields@fieldses.org>
57J. Bruce Fields <bfields@citi.umich.edu> <bfields@pig.linuxdev.us.dell.com>
58J. Bruce Fields <bfields@citi.umich.edu> <bfields@puzzle.fieldses.org>
59Jakub Narębski <jnareb@gmail.com>
60Jason Riedy <ejr@eecs.berkeley.edu> <ejr@EECS.Berkeley.EDU>
61Jason Riedy <ejr@eecs.berkeley.edu> <ejr@cs.berkeley.edu>
62Jay Soffian <jaysoffian@gmail.com> <jaysoffian+git@gmail.com>
63Jeff King <peff@peff.net> <peff@github.com>
64Jeff Muizelaar <jmuizelaar@mozilla.com> <jeff@infidigm.net>
65Joachim Berdal Haga <cjhaga@fys.uio.no>
66Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
67Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
68Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
69Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
70Jon Loeliger <jdl@freescale.com>
71Jon Seymour <jon.seymour@gmail.com> <jon@blackcubes.dyndns.org>
72Jonathan Nieder <jrnieder@gmail.com> <jrnieder@uchicago.edu>
73Jonathan del Strother <jon.delStrother@bestbefore.tv> <maillist@steelskies.com>
74Josh Triplett <josh@joshtriplett.org> <josh@freedesktop.org>
75Josh Triplett <josh@joshtriplett.org> <josht@us.ibm.com>
76Julian Phillips <julian@quantumfyre.co.uk> <jp3@quantumfyre.co.uk>
77Junio C Hamano <gitster@pobox.com> <gitster@pobox.com>
78Junio C Hamano <gitster@pobox.com> <junio@hera.kernel.org>
79Junio C Hamano <gitster@pobox.com> <junio@kernel.org>
80Junio C Hamano <gitster@pobox.com> <junio@pobox.com>
81Junio C Hamano <gitster@pobox.com> <junio@twinsun.com>
82Junio C Hamano <gitster@pobox.com> <junkio@cox.net>
83Junio C Hamano <gitster@pobox.com> <junkio@twinsun.com>
84Karl Wiberg <kha@treskal.com> Karl Hasselström <kha@treskal.com>
85Karl Wiberg <kha@treskal.com> Karl Hasselström <kha@yoghurt.hemma.treskal.com>
86Karsten Blees <blees@dcon.de> <karsten.blees@dcon.de>
87Karsten Blees <blees@dcon.de> <karsten.blees@gmail.com>
88Kay Sievers <kay.sievers@vrfy.org> <kay.sievers@suse.de>
89Kay Sievers <kay.sievers@vrfy.org> <kay@mam.(none)>
90Keith Cascio <keith@CS.UCLA.EDU> <keith@cs.ucla.edu>
91Kent Engstrom <kent@lysator.liu.se>
92Kevin Leung <kevinlsk@gmail.com>
93Kirill Smelkov <kirr@navytux.spb.ru> <kirr@landau.phys.spbu.ru>
94Kirill Smelkov <kirr@navytux.spb.ru> <kirr@mns.spb.ru>
95Knut Franke <Knut.Franke@gmx.de> <k.franke@science-computing.de>
96Lars Doelle <lars.doelle@on-line ! de>
97Lars Doelle <lars.doelle@on-line.de>
98Li Hong <leehong@pku.edu.cn>
99Linus Torvalds <torvalds@linux-foundation.org> <torvalds@evo.osdl.org>
100Linus Torvalds <torvalds@linux-foundation.org> <torvalds@g5.osdl.org>
101Linus Torvalds <torvalds@linux-foundation.org> <torvalds@osdl.org>
102Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org.(none)>
103Linus Torvalds <torvalds@linux-foundation.org> <torvalds@ppc970.osdl.org>
104Linus Torvalds <torvalds@linux-foundation.org> <torvalds@woody.linux-foundation.org>
105Lukas Sandström <luksan@gmail.com> <lukass@etek.chalmers.se>
106Marc Khouzam <marc.khouzam@ericsson.com> <marc.khouzam@gmail.com>
107Marc-André Lureau <marcandre.lureau@gmail.com>
108Marco Costalba <mcostalba@gmail.com> <mcostalba@yahoo.it>
109Mark Levedahl <mdl123@verizon.net> <mlevedahl@gmail.com>
110Mark Rada <marada@uwaterloo.ca>
111Martin Langhoff <martin@laptop.org> <martin@catalyst.net.nz>
112Martin von Zweigbergk <martinvonz@gmail.com> <martin.von.zweigbergk@gmail.com>
113Matt Draisey <matt@draisey.ca> <mattdraisey@sympatico.ca>
114Matt Kraai <kraai@ftbfs.org> <matt.kraai@amo.abbott.com>
115Matthias Kestenholz <matthias@spinlock.ch> <mk@spinlock.ch>
116Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
117Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
118Michael Coleman <tutufan@gmail.com>
119Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
120Michael W. Olson <mwolson@gnu.org>
121Michael Witten <mfwitten@gmail.com> <mfwitten@MIT.EDU>
122Michael Witten <mfwitten@gmail.com> <mfwitten@mit.edu>
123Michele Ballabio <barra_cuda@katamail.com>
124Miklos Vajna <vmiklos@frugalware.org> <vmiklos@suse.cz>
125Namhyung Kim <namhyung@gmail.com> <namhyung.kim@lge.com>
126Namhyung Kim <namhyung@gmail.com> <namhyung@kernel.org>
127Nanako Shiraishi <nanako3@bluebottle.com>
128Nanako Shiraishi <nanako3@lavabit.com>
129Nelson Elhage <nelhage@mit.edu> <nelhage@MIT.EDU>
130Nelson Elhage <nelhage@mit.edu> <nelhage@ksplice.com>
131Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
132Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com> <nicolas.morey@free.fr>
133Nicolas Morey-Chaisemartin <devel-git@morey-chaisemartin.com> <nmorey@kalray.eu>
134Paolo Bonzini <bonzini@gnu.org> <paolo.bonzini@lu.unisi.ch>
135Pascal Obry <pascal@obry.net> <pascal.obry@gmail.com>
136Pascal Obry <pascal@obry.net> <pascal.obry@wanadoo.fr>
137Pat Notz <patnotz@gmail.com> <pknotz@sandia.gov>
138Paul Mackerras <paulus@samba.org> <paulus@dorrigo.(none)>
139Paul Mackerras <paulus@samba.org> <paulus@pogo.(none)>
140Peter Krefting <peter@softwolves.pp.se> <peter@softwolves.pp.se>
141Peter Krefting <peter@softwolves.pp.se> <peter@svarten.intern.softwolves.pp.se>
142Petr Baudis <pasky@ucw.cz> <pasky@suse.cz>
143Petr Baudis <pasky@ucw.cz> <xpasky@machine>
144Phil Hord <hordp@cisco.com> <phil.hord@gmail.com>
145Philip Jägenstedt <philip@foolip.org> <philip.jagenstedt@gmail.com>
146Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
147Philippe Bruhat <book@cpan.org>
148Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
149Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
150René Scharfe <rene.scharfe@lsrfire.ath.cx>
151Robert Fitzsimons <robfitz@273k.net>
152Robert Zeh <robert.a.zeh@gmail.com>
153Robin Rosenberg <robin.rosenberg@dewire.com> <robin.rosenberg.lists@dewire.com>
154Salikh Zakirov <salikh.zakirov@gmail.com> <Salikh.Zakirov@Intel.com>
155Sam Vilain <sam@vilain.net> <sam.vilain@catalyst.net.nz>
156Santi Béjar <santi@agolina.net> <sbejar@gmail.com>
157Sean Estabrooks <seanlkml@sympatico.ca>
158Sebastian Schuberth <sschuberth@gmail.com> <sschuberth@visageimaging.com>
159Shawn O. Pearce <spearce@spearce.org>
160Stefan Sperling <stsp@elego.de> <stsp@stsp.name>
161Stephen Boyd <bebarino@gmail.com> <sboyd@codeaurora.org>
162Steven Grimm <koreth@midwinter.com> <sgrimm@sgrimm-mbp.local>
163Sven Verdoolaege <skimo@kotnet.org> <Sven.Verdoolaege@cs.kuleuven.ac.be>
164Sven Verdoolaege <skimo@kotnet.org> <skimo@liacs.nl>
165Tay Ray Chuan <rctay89@gmail.com>
166Ted Percival <ted@midg3t.net> <ted.percival@quest.com>
167Theodore Ts'o <tytso@mit.edu>
168Thomas Ackermann <th.acker@arcor.de> <th.acker66@arcor.de>
169Thomas Rast <trast@inf.ethz.ch> <trast@student.ethz.ch>
170Timo Hirvonen <tihirvon@gmail.com> <tihirvon@ee.oulu.fi>
171Toby Allsopp <Toby.Allsopp@navman.co.nz> <toby.allsopp@navman.co.nz>
172Tom Grennan <tmgrennan@gmail.com> <tgrennan@redback.com>
173Tony Luck <tony.luck@intel.com>
174Trent Piepho <tpiepho@gmail.com> <tpiepho@freescale.com>
175Trent Piepho <tpiepho@gmail.com> <xyzzy@speakeasy.org>
176Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
177Uwe Kleine-König <Uwe_Zeisberger@digi.com>
178Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
179Uwe Kleine-König <uzeisberger@io.fsforth.de>
180Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
181Ville Skyttä <scop@xemacs.org>
182Vitaly "_Vi" Shukela <public_vi@tut.by>
183W. Trevor King <wking@tremily.us> <wking@drexel.edu>
184William Pursell <bill.pursell@gmail.com>
185YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
186anonymous <linux@horizon.com>
187anonymous <linux@horizon.net>
188İsmail Dönmez <ismail@pardus.org.tr>