[PATCH] add .mailmap for proper git-shortlog output

This list was built into the git-shortlog tool and has been removed in the
latest version.  It should be maintained separately so this is what this
patch does.

A couple more entries were added to the original list as well.

Signed-off-by: Nicolas Pitre <[email protected]>
Acked-by: Junio C Hamano <[email protected]>
Cc: Linus Torvalds <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/.mailmap b/.mailmap
new file mode 100644 (file)
index 0000000..bf62dbe
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,96 @@
+#
+# This list is used by git-shortlog to fix a few botched name translations
+# in the git archive, either because the author's full name was messed up
+# and/or not always written the same way, making contributions from the
+# same person appearing not to be so or badly displayed.
+#
+# repo-abbrev: /pub/scm/linux/kernel/git/
+#
+
+Aaron Durbin <[email protected]>
+Adam Oldham <[email protected]>
+Adam Radford <[email protected]>
+Adrian Bunk <[email protected]>
+Alan Cox <[email protected]>
+Alan Cox <[email protected]>
+Aleksey Gorelov <[email protected]>
+Al Viro <[email protected]>
+Al Viro <[email protected]>
+Andreas Herrmann <[email protected]>
+Andrew Morton <[email protected]>
+Andrew Vasquez <[email protected]>
+Andy Adamson <[email protected]>
+Arnaud Patard <[email protected]>
+Arnd Bergmann <[email protected]>
+Axel Dyks <[email protected]>
+Ben Gardner <[email protected]>
+Ben M Cahill <[email protected]>
+Björn Steinbrink <[email protected]>
+Brian Avery <[email protected]>
+Brian King <[email protected]>
+Christoph Hellwig <[email protected]>
+Corey Minyard <[email protected]>
+David Brownell <[email protected]>
+David Woodhouse <[email protected]>
+Domen Puncer <[email protected]>
+Douglas Gilbert <[email protected]>
+Ed L. Cashin <[email protected]>
+Evgeniy Polyakov <[email protected]>
+Felipe W Damasio <[email protected]>
+Felix Kuhling <[email protected]>
+Felix Moeller <[email protected]>
+Filipe Lautert <[email protected]>
+Franck Bui-Huu <[email protected]>
+Frank Zago <[email protected]>
+Greg Kroah-Hartman <greg@echidna.(none)>
+Greg Kroah-Hartman <[email protected]>
+Greg Kroah-Hartman <[email protected]>
+Henk Vergonet <[email protected]>
+Henrik Kretzschmar <[email protected]>
+Herbert Xu <[email protected]>
+Jacob Shin <[email protected]>
+James Bottomley <jejb@mulgrave.(none)>
+James Bottomley <[email protected]>
+James E Wilson <[email protected]>
+James Ketrenos <jketreno@io.(none)>
+Jean Tourrilhes <[email protected]>
+Jeff Garzik <[email protected]>
+Jens Axboe <[email protected]>
+Jens Osterkamp <[email protected]>
+John Stultz <[email protected]>
+Juha Yrjola <at solidboot.com>
+Juha Yrjola <[email protected]>
+Juha Yrjola <[email protected]>
+Kay Sievers <[email protected]>
+Kenneth W Chen <[email protected]>
+Koushik <[email protected]>
+Leonid I Ananiev <[email protected]>
+Linas Vepstas <[email protected]>
+Matthieu CASTET <[email protected]>
+Michel Dänzer <[email protected]>
+Mitesh shah <[email protected]>
+Morten Welinder <[email protected]>
+Morten Welinder <[email protected]>
+Morten Welinder <[email protected]>
+Morten Welinder <[email protected]>
+Nguyen Anh Quynh <[email protected]>
+Paolo 'Blaisorblade' Giarrusso <[email protected]>
+Patrick Mochel <[email protected]>
+Peter A Jonsson <[email protected]>
+Praveen BP <[email protected]>
+Rajesh Shah <[email protected]>
+Ralf Baechle <[email protected]>
+Ralf Wildenhues <[email protected]>
+Rémi Denis-Courmont <[email protected]>
+Rudolf Marek <[email protected]>
+Rui Saraiva <[email protected]>
+Sachin P Sant <[email protected]>
+Sam Ravnborg <[email protected]>
+Simon Kelley <[email protected]>
+Stéphane Witzmann <[email protected]>
+Stephen Hemminger <[email protected]>
+Tejun Heo <[email protected]>
+Thomas Graf <[email protected]>
+Tony Luck <[email protected]>
+Tsuneo Yoshioka <[email protected]>
+Valdis Kletnieks <[email protected]>