Merge branch 'sb/mailmap-updates'

* sb/mailmap-updates:
  .mailmap: combine more (email, name) to individual persons
  .mailmap: Combine more (email, name) to individual persons
  .mailmap: Map email addresses to names

Author: gitster

.mailmap

@@ -5,99 +5,216 @@
 # same person appearing not to be so.
 #
 
+<[email protected]> <[email protected]>
+Alejandro R. Sedeño <[email protected]> <[email protected]>
 Alex Bennée <[email protected]>
+Alex Riesen <[email protected]> <[email protected]>
+Alex Riesen <[email protected]> <[email protected]>
+Alex Riesen <[email protected]> <[email protected]>
+Alex Vandiver <[email protected]> <[email protected]>
 Alexander Gavrilov <[email protected]>
+Alexey Shumkin <[email protected]> <[email protected]>
+Anders Kaseorg <[email protected]> <[email protected]>
+Anders Kaseorg <[email protected]> <[email protected]>
 Aneesh Kumar K.V <[email protected]>
+Ben Walton <[email protected]> <[email protected]>
+Bernt Hansen <[email protected]> <[email protected]>
+Brandon Casey <[email protected]> <[email protected]>
 Brian M. Carlson <[email protected]>
+Bryan Larsen <[email protected]> <[email protected]>
+Bryan Larsen <[email protected]> <[email protected]>
 Cheng Renquan <[email protected]>
 Chris Shoemaker <[email protected]>
+Chris Wright <[email protected]> <[email protected]>
+Csaba Henk <[email protected]> <[email protected]>
 Dan Johnson <[email protected]>
-Dana L. How <[email protected]>
-Dana L. How <[email protected]>
+Dana L. How <[email protected]> <[email protected]>
 Daniel Barkalow <[email protected]>
+David Brown <[email protected]> <[email protected]>
 David D. Kilzer <[email protected]>
 David Kågedal <[email protected]>
+David Reiss <[email protected]> <dreiss@dreiss-vmware.(none)>
 David S. Miller <[email protected]>
 Deskin Miller <[email protected]>
 Dirk Süsserott <[email protected]>
+Eric Blake <[email protected]> <[email protected]>
+Eric Hanchrow <[email protected]> <[email protected]>
 Eric S. Raymond <[email protected]>
 Erik Faye-Lund <[email protected]> <[email protected]>
-Fredrik Kuivinen <[email protected]>
+Eyvind Bernhardsen <[email protected]> <[email protected]>
+Florian Achleitner <[email protected]> <[email protected]>
+Franck Bui-Huu <[email protected]> <[email protected]>
+Frank Lichtenheld <[email protected]> <[email protected]>
+Frank Lichtenheld <[email protected]> <[email protected]>
+Fredrik Kuivinen <[email protected]> <[email protected]>
 Frédéric Heitzmann <[email protected]>
+Garry Dolley <[email protected]> <[email protected]>
+Greg Price <[email protected]> <[email protected]>
+Greg Price <[email protected]> <[email protected]>
+Heiko Voigt <[email protected]> <[email protected]>
 H. Merijn Brand <[email protected]> H.Merijn Brand <[email protected]>
-H. Peter Anvin <[email protected]>
-H. Peter Anvin <[email protected]>
-H. Peter Anvin <[email protected]>
+H. Peter Anvin <[email protected]> <[email protected]>
+H. Peter Anvin <[email protected]> <[email protected]>
+H. Peter Anvin <[email protected]> <[email protected]>
+H. Peter Anvin <[email protected]> <[email protected]>
+Han-Wen Nienhuys <[email protected]> Han-Wen Nienhuys <[email protected]>
 Horst H. von Brand <[email protected]>
-İsmail Dönmez <[email protected]>
+J. Bruce Fields <[email protected]> <[email protected]>
+J. Bruce Fields <[email protected]> <[email protected]>
+J. Bruce Fields <[email protected]> <[email protected]>
 Jakub Narębski <[email protected]>
-Jay Soffian <[email protected]>
+Jason Riedy <[email protected]> <[email protected]>
+Jason Riedy <[email protected]> <[email protected]>
+Jay Soffian <[email protected]> <[email protected]>
 Jeff King <[email protected]> <[email protected]>
+Jeff Muizelaar <[email protected]> <[email protected]>
+Jim Meyering <[email protected]> <[email protected]>
 Joachim Berdal Haga <[email protected]>
-Johannes Sixt <[email protected]> <[email protected]>
-Johannes Sixt <[email protected]> <[email protected]>
+Johannes Schindelin <[email protected]> <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>
-Jon Loeliger <[email protected]>
-Jon Seymour <[email protected]>
-Jonathan Nieder <[email protected]>
+Johannes Sixt <[email protected]> <[email protected]>
+Johannes Sixt <[email protected]> <[email protected]>
+Jon Loeliger <[email protected]> <[email protected]>
+Jon Loeliger <[email protected]> <[email protected]>
+Jon Seymour <[email protected]> <[email protected]>
+Jonathan Nieder <[email protected]> <[email protected]>
+Jonathan del Strother <[email protected]> <[email protected]>
+Josh Triplett <[email protected]> <[email protected]>
+Josh Triplett <[email protected]> <[email protected]>
+Julian Phillips <[email protected]> <[email protected]>
 Junio C Hamano <[email protected]> <[email protected]>
-Junio C Hamano <[email protected]> <[email protected]>
-Junio C Hamano <[email protected]> <[email protected]>
-Junio C Hamano <[email protected]> <[email protected]>
 Junio C Hamano <[email protected]> <[email protected]>
 Junio C Hamano <[email protected]> <[email protected]>
+Junio C Hamano <[email protected]> <[email protected]>
+Junio C Hamano <[email protected]> <[email protected]>
 Junio C Hamano <[email protected]> <[email protected]>
-Karl Hasselström <[email protected]>
-Kevin Leung <[email protected]>
+Junio C Hamano <[email protected]> <[email protected]>
+Karl Wiberg <[email protected]> Karl Hasselström <[email protected]>
+Karl Wiberg <[email protected]> Karl Hasselström <[email protected]>
+Karsten Blees <[email protected]> <[email protected]>
+Karsten Blees <[email protected]> <[email protected]>
+Kay Sievers <[email protected]> <[email protected]>
+Kay Sievers <[email protected]> <kay@mam.(none)>
+Keith Cascio <[email protected]> <[email protected]>
 Kent Engstrom <[email protected]>
+Kevin Leung <[email protected]>
+Kirill Smelkov <[email protected]> <[email protected]>
+Kirill Smelkov <[email protected]> <[email protected]>
+Knut Franke <[email protected]> <[email protected]>
 Lars Doelle <lars.doelle@on-line ! de>
 Lars Doelle <[email protected]>
+Lars Noschinski <[email protected]> <[email protected]>
 Li Hong <[email protected]>
-Linus Torvalds <[email protected]> <[email protected]>
-Linus Torvalds <[email protected]> <[email protected]>
-Linus Torvalds <[email protected]> <[email protected]>
 Linus Torvalds <[email protected]> <[email protected]>
-Linus Torvalds <[email protected]> <[email protected]>
+Linus Torvalds <[email protected]> <[email protected]>
+Linus Torvalds <[email protected]> <[email protected]>
 Linus Torvalds <[email protected]> <[email protected].(none)>
-Lukas Sandström <[email protected]>
+Linus Torvalds <[email protected]> <[email protected]>
+Linus Torvalds <[email protected]> <[email protected]>
+Lukas Sandström <[email protected]> <[email protected]>
+Marc Khouzam <[email protected]> <[email protected]>
 Marc-André Lureau <[email protected]>
+Marco Costalba <[email protected]> <[email protected]>
+Mark Levedahl <[email protected]> <[email protected]>
 Mark Rada <[email protected]>
 Martin Langhoff <[email protected]> <[email protected]>
 Martin von Zweigbergk <[email protected]> <[email protected]>
+Matt Draisey <[email protected]> <[email protected]>
+Matt Kraai <[email protected]> <[email protected]>
+Matt McCutchen <[email protected]> <[email protected]>
+Matthias Kestenholz <[email protected]> <[email protected]>
+Matthias Urlichs <[email protected]> <smurf@kiste.(none)>
+Matthias Urlichs <[email protected]> <[email protected]>
 Michael Coleman <[email protected]>
 Michael J Gruber <[email protected]> <[email protected]>
 Michael W. Olson <[email protected]>
+Michael Witten <[email protected]> <[email protected]>
+Michael Witten <[email protected]> <[email protected]>
+Michal Rokos <[email protected]> <[email protected]>
 Michele Ballabio <[email protected]>
+Miklos Vajna <[email protected]> <[email protected]>
+Namhyung Kim <[email protected]> <[email protected]>
+Namhyung Kim <[email protected]> <[email protected]>
 Nanako Shiraishi <[email protected]>
 Nanako Shiraishi <[email protected]>
+Nelson Elhage <[email protected]> <[email protected]>
+Nelson Elhage <[email protected]> <[email protected]>
 Nguyễn Thái Ngọc Duy <[email protected]>
-<[email protected]> <[email protected]>
-Peter Krefting <[email protected]> <[email protected]>
+Nick Stokoe <[email protected]> Nick Woolley <[email protected]>
+Nick Stokoe <[email protected]> Nick Woolley <[email protected]>
+Nicolas Morey-Chaisemartin <[email protected]> <[email protected]>
+Nicolas Morey-Chaisemartin <[email protected]> <[email protected]>
+Nicolas Sebrecht <[email protected]> <[email protected]>
+Paolo Bonzini <[email protected]> <[email protected]>
+Pascal Obry <[email protected]> <[email protected]>
+Pascal Obry <[email protected]> <[email protected]>
+Pat Notz <[email protected]> <[email protected]>
+Paul Mackerras <[email protected]> <paulus@dorrigo.(none)>
+Paul Mackerras <[email protected]> <paulus@pogo.(none)>
+Peter Baumann <[email protected]> <[email protected]>
+Peter Baumann <[email protected]> <[email protected]>
 Peter Krefting <[email protected]> <[email protected]>
+Peter Krefting <[email protected]> <[email protected]>
 Petr Baudis <[email protected]> <[email protected]>
+Petr Baudis <[email protected]> <xpasky@machine>
+Phil Hord <[email protected]> <[email protected]>
+Philip Jägenstedt <[email protected]> <[email protected]>
+Philipp A. Hartmann <[email protected]> <[email protected]>
 Philippe Bruhat <[email protected]>
 Ralf Thielow <[email protected]> <[email protected]>
 Ramsay Allan Jones <[email protected]>
 René Scharfe <[email protected]>
 Robert Fitzsimons <[email protected]>
+Robert Shearman <[email protected]> <[email protected]>
 Robert Zeh <[email protected]>
-Sam Vilain <[email protected]>
-Santi Béjar <[email protected]>
+Robin Rosenberg <[email protected]> <[email protected]>
+Ryan Anderson <[email protected]> <[email protected]>
+Salikh Zakirov <[email protected]> <[email protected]>
+Sam Vilain <[email protected]> <[email protected]>
+Santi Béjar <[email protected]> <[email protected]>
 Sean Estabrooks <[email protected]>
+Sebastian Schuberth <[email protected]> <[email protected]>
+Seth Falcon <[email protected]> <[email protected]>
 Shawn O. Pearce <[email protected]>
-Steven Grimm <[email protected]>
+Simon Hausmann <[email protected]> <[email protected]>
+Simon Hausmann <[email protected]> <[email protected]>
+Stefan Naewe <[email protected]> <[email protected]>
+Stefan Naewe <[email protected]> <[email protected]>
+Stefan Sperling <[email protected]> <[email protected]>
+Stephen Boyd <[email protected]> <[email protected]>
+Steven Drake <[email protected]> <[email protected]>
+Steven Grimm <[email protected]> <[email protected]>
+Steven Walter <[email protected]> <[email protected]>
+Steven Walter <[email protected]> <[email protected]>
+Sven Verdoolaege <[email protected]> <[email protected]>
+Sven Verdoolaege <[email protected]> <[email protected]>
 Tay Ray Chuan <[email protected]>
+Ted Percival <[email protected]> <[email protected]>
 Theodore Ts'o <[email protected]>
+Thomas Ackermann <[email protected]> <[email protected]>
 Thomas Rast <[email protected]> <[email protected]>
+Timo Hirvonen <[email protected]> <[email protected]>
+Toby Allsopp <[email protected]> <[email protected]>
+Tom Grennan <[email protected]> <[email protected]>
+Tommi Virtanen <[email protected]> <[email protected]>
+Tommi Virtanen <[email protected]> <[email protected]>
+Tommy Thorn <[email protected]> <[email protected]>
 Tony Luck <[email protected]>
-Uwe Kleine-König <[email protected]>
-Uwe Kleine-König <[email protected]>
-Uwe Kleine-König <[email protected]>
-Uwe Kleine-König <[email protected]>
-Uwe Kleine-König <[email protected]>
-Ville Skyttä <[email protected]>
+Tor Arne Vestbø <[email protected]> <[email protected]>
+Trent Piepho <[email protected]> <[email protected]>
+Trent Piepho <[email protected]> <[email protected]>
+Uwe Kleine-König <[email protected]> <[email protected]>
+Uwe Kleine-König <[email protected]> <[email protected]>
+Uwe Kleine-König <[email protected]> <[email protected]>
+Uwe Kleine-König <[email protected]> <[email protected]>
+Ville Skyttä <[email protected]> <[email protected]>
 Vitaly "_Vi" Shukela <[email protected]>
+W. Trevor King <[email protected]> <[email protected]>
 William Pursell <[email protected]>
+YONETANI Tomokazu <[email protected]> <[email protected]>
+YONETANI Tomokazu <[email protected]> <[email protected]>
 YOSHIFUJI Hideaki <[email protected]>
+# the two anonymous contributors are different persons:
 anonymous <[email protected]>
 anonymous <[email protected]>
+İsmail Dönmez <[email protected]>