The same kind of cleanup as sent earlier today
(2e2ae79df4fabea0157c5eb527b5396eb89185a1 locally here)

I asked all the people before, whether
they like their lines added. Many had
requests to change the order of the mail address.

When having this patch applied, you'll notice the
bug as described here
http://marc.info/?l=git&m=137364524514927&w=2
http://www.mail-archive.com/[email protected]/msg31964.html
("Bug in .mailmap handling?", for example look for Knut Franke)

Signed-off-by: Stefan Beller <[email protected]>
---
 .mailmap | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 1179767..1d6ba17 100644
--- a/.mailmap
+++ b/.mailmap
@@ -7,6 +7,7 @@
 
 Alejandro R. Sedeño <[email protected]> <[email protected]>
 Alexander Gavrilov <[email protected]>
+Alexey Shumkin <[email protected]> <[email protected]>
 Alex Bennée <[email protected]>
 Alex Riesen <[email protected]> <[email protected]>
 Alex Riesen <[email protected]> <[email protected]>
@@ -18,12 +19,15 @@ anonymous <[email protected]>
 anonymous <[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]>
 Dana L. How <[email protected]>
 Dana L. How <[email protected]>
 Daniel Barkalow <[email protected]>
 Dan Johnson <[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)>
@@ -31,7 +35,10 @@ David S. Miller <[email protected]>
 Deskin Miller <[email protected]>
 Dirk Süsserott <[email protected]>
 Eric S. Raymond <[email protected]>
+Eric Blake <[email protected]> <[email protected]>
+Eric Hanchrow <[email protected]> <[email protected]>
 Erik Faye-Lund <[email protected]> <[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]>
@@ -47,19 +54,25 @@ H. Peter Anvin <[email protected]> 
<[email protected]>
 H. Peter Anvin <[email protected]> <[email protected]>
 İsmail Dönmez <[email protected]>
 Jakub Narębski <[email protected]>
+Jason Riedy <[email protected]> <[email protected]>
+Jason Riedy <[email protected]> <[email protected]>
 Jay Soffian <[email protected]> <[email protected]>
 J. Bruce Fields <[email protected]> <[email protected]>
 J. Bruce Fields <[email protected]> <[email protected]>
 J. Bruce Fields <[email protected]> <[email protected]>
 Jeff King <[email protected]> <[email protected]>
+Jeff Muizelaar <[email protected]> <[email protected]>
 Joachim Berdal Haga <[email protected]>
 Johannes Schindelin <[email protected]> <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>
 Johannes Sixt <[email protected]> <[email protected]>
+Jonathan del Strother <[email protected]> <[email protected]>
 Jonathan Nieder <[email protected]> <[email protected]>
 Jon Loeliger <[email protected]>
-Jon Seymour <[email protected]>
+Jon Seymour <[email protected]> <[email protected]>
+Josh Triplett <[email protected]> <[email protected]>
+Josh Triplett <[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]>
@@ -71,11 +84,14 @@ Karl Wiberg <[email protected]> Karl Hasselström 
<[email protected]>
 Karl Wiberg <[email protected]> Karl Hasselström 
<[email protected]>
 Kay Sievers <[email protected]> <kay@mam.(none)>
 Kay Sievers <[email protected]> <[email protected]>
+Karsten Blees <[email protected]> <[email protected]>
+Karsten Blees <[email protected]> <[email protected]>
 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]>
 Li Hong <[email protected]>
@@ -85,11 +101,14 @@ Linus Torvalds <[email protected]> 
<[email protected]>
 Linus Torvalds <[email protected]> <[email protected]>
 Linus Torvalds <[email protected]> 
<[email protected].(none)>
 Linus Torvalds <[email protected]> 
<[email protected]>
-Lukas Sandström <[email protected]>
+Lukas Sandström <[email protected]> <[email protected]>
+Matt Kraai <[email protected]> <[email protected]>
 Marc-André Lureau <[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]>
 Matthias Kestenholz <[email protected]> <[email protected]>
 Matthias Urlichs <[email protected]> <smurf@kiste.(none)>
 Matthias Urlichs <[email protected]> <[email protected]>
@@ -104,8 +123,11 @@ 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]>
+Paolo Bonzini <[email protected]> <[email protected]>
 Pascal Obry <[email protected]> <[email protected]>
 Pascal Obry <[email protected]> <[email protected]>
 Paul Mackerras <[email protected]> <paulus@dorrigo.(none)>
@@ -114,6 +136,7 @@ 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]>
 Philippe Bruhat <[email protected]>
 Ralf Thielow <[email protected]> <[email protected]>
 Ramsay Allan Jones <[email protected]>
@@ -145,6 +168,7 @@ Uwe Kleine-König <[email protected]>
 Uwe Kleine-König <[email protected]>
 Ville Skyttä <[email protected]>
 Vitaly "_Vi" Shukela <[email protected]>
+W. Trevor King <[email protected]> <[email protected]>
 William Pursell <[email protected]>
 YOSHIFUJI Hideaki <[email protected]>
 
-- 
1.8.3.2.790.g9192b0b

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to