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