The patch titled
add .mailmap for proper git-shortlog output
has been removed from the -mm tree. Its filename was
add-mailmap-for-proper-git-shortlog-output.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: add .mailmap for proper git-shortlog output
From: Nicolas Pitre <nico@xxxxxxx>
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 <nico@xxxxxxx>
Acked-by: Junio C Hamano <junkio@xxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
.mailmap | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 96 insertions(+)
diff -puN /dev/null .mailmap
--- /dev/null
+++ a/.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 <adurbin@xxxxxxxxxx>
+Adam Oldham <oldhamca@xxxxxxxxx>
+Adam Radford <aradford@xxxxxxxxx>
+Adrian Bunk <bunk@xxxxxxxxx>
+Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
+Alan Cox <root@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
+Aleksey Gorelov <aleksey_gorelov@xxxxxxxxxxx>
+Al Viro <viro@xxxxxxxxxxxxxxxx>
+Al Viro <viro@xxxxxxxxxxxxxxxxxx>
+Andreas Herrmann <aherrman@xxxxxxxxxx>
+Andrew Morton <akpm@xxxxxxxx>
+Andrew Vasquez <andrew.vasquez@xxxxxxxxxx>
+Andy Adamson <andros@xxxxxxxxxxxxxx>
+Arnaud Patard <arnaud.patard@xxxxxxxxxxx>
+Arnd Bergmann <arnd@xxxxxxxx>
+Axel Dyks <xl@xxxxxxxxxxxx>
+Ben Gardner <bgardner@xxxxxxxxxx>
+Ben M Cahill <ben.m.cahill@xxxxxxxxx>
+Björn Steinbrink <B.Steinbrink@xxxxxx>
+Brian Avery <b.avery@xxxxxx>
+Brian King <brking@xxxxxxxxxx>
+Christoph Hellwig <hch@xxxxxx>
+Corey Minyard <minyard@xxxxxxx>
+David Brownell <david-b@xxxxxxxxxxx>
+David Woodhouse <dwmw2@xxxxxxxxxxxxxxxxxxxxxxx>
+Domen Puncer <domen@xxxxxxxxxxxx>
+Douglas Gilbert <dougg@xxxxxxxxxx>
+Ed L. Cashin <ecashin@xxxxxxxxxx>
+Evgeniy Polyakov <johnpol@xxxxxxxxxxx>
+Felipe W Damasio <felipewd@xxxxxxxxxxxx>
+Felix Kuhling <fxkuehl@xxxxxx>
+Felix Moeller <felix@xxxxxxxxxxxx>
+Filipe Lautert <filipe@xxxxxxxxxxx>
+Franck Bui-Huu <vagabon.xyz@xxxxxxxxx>
+Frank Zago <fzago@xxxxxxxxxxxxxxxxxxxxx>
+Greg Kroah-Hartman <greg@echidna.(none)>
+Greg Kroah-Hartman <gregkh@xxxxxxx>
+Greg Kroah-Hartman <greg@xxxxxxxxx>
+Henk Vergonet <Henk.Vergonet@xxxxxxxxx>
+Henrik Kretzschmar <henne@xxxxxxxxxxxxxxxx>
+Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
+Jacob Shin <Jacob.Shin@xxxxxxx>
+James Bottomley <jejb@mulgrave.(none)>
+James Bottomley <jejb@xxxxxxxxxxxxxxxxxxxxxxx>
+James E Wilson <wilson@xxxxxxxxxxxx>
+James Ketrenos <jketreno@io.(none)>
+Jean Tourrilhes <jt@xxxxxxxxxx>
+Jeff Garzik <jgarzik@xxxxxxxxxxxxxx>
+Jens Axboe <axboe@xxxxxxx>
+Jens Osterkamp <Jens.Osterkamp@xxxxxxxxxx>
+John Stultz <johnstul@xxxxxxxxxx>
+Juha Yrjola <at solidboot.com>
+Juha Yrjola <juha.yrjola@xxxxxxxxx>
+Juha Yrjola <juha.yrjola@xxxxxxxxxxxxx>
+Kay Sievers <kay.sievers@xxxxxxxx>
+Kenneth W Chen <kenneth.w.chen@xxxxxxxxx>
+Koushik <raghavendra.koushik@xxxxxxxxxxxx>
+Leonid I Ananiev <leonid.i.ananiev@xxxxxxxxx>
+Linas Vepstas <linas@xxxxxxxxxxxxxx>
+Matthieu CASTET <castet.matthieu@xxxxxxx>
+Michel Dänzer <michel@xxxxxxxxxxxxxxxxxxxx>
+Mitesh shah <mshah@xxxxxxxx>
+Morten Welinder <terra@xxxxxxxxx>
+Morten Welinder <welinder@xxxxxxxxxxxxxxxxxx>
+Morten Welinder <welinder@xxxxxxxxxxxxxxxxx>
+Morten Welinder <welinder@xxxxxxxxx>
+Nguyen Anh Quynh <aquynh@xxxxxxxxx>
+Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
+Patrick Mochel <mochel@xxxxxxxxxxxxxxxxxx>
+Peter A Jonsson <pj@xxxxxxxxxxx>
+Praveen BP <praveenbp@xxxxxx>
+Rajesh Shah <rajesh.shah@xxxxxxxxx>
+Ralf Baechle <ralf@xxxxxxxxxxxxxx>
+Ralf Wildenhues <Ralf.Wildenhues@xxxxxx>
+Rémi Denis-Courmont <rdenis@xxxxxxxxxxxxxxxx>
+Rudolf Marek <R.Marek@xxxxxxxxxx>
+Rui Saraiva <rmps@xxxxxxxxxxxxxxx>
+Sachin P Sant <ssant@xxxxxxxxxx>
+Sam Ravnborg <sam@xxxxxxxxxxxxxxxxx>
+Simon Kelley <simon@xxxxxxxxxxxxxxxxx>
+Stéphane Witzmann <stephane.witzmann@xxxxxxxxxxxxxxxxxxxxxxxxx>
+Stephen Hemminger <shemminger@xxxxxxxx>
+Tejun Heo <htejun@xxxxxxxxx>
+Thomas Graf <tgraf@xxxxxxx>
+Tony Luck <tony.luck@xxxxxxxxx>
+Tsuneo Yoshioka <Tsuneo.Yoshioka@xxxxxxxxxxxx>
+Valdis Kletnieks <Valdis.Kletnieks@xxxxxx>
_
Patches currently in -mm which might be from nico@xxxxxxx are
origin.patch
git-arm.patch
update-smc91x-driver-with-arm-versatile-board-info.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
