Merge branch 'mg/mailmap-update'

gitster · gitster · commit 59d1e01d6986 · 2010-04-03T12:28:40.000-07:00
* mg/mailmap-update:
  .mailmap: Entries for Alex Bennée, Deskin Miller, Vitaly "_Vi" Shukela
diff --git a/.mailmap b/.mailmap
@@ -5,6 +5,7 @@
 # same person appearing not to be so.
 #
 
+Alex Bennée <kernel-hacker@bennee.com>
 Alexander Gavrilov <angavrilov@gmail.com>
 Aneesh Kumar K.V <aneesh.kumar@gmail.com>
 Brian M. Carlson <sandals@crustytoothpaste.ath.cx>
@@ -15,6 +16,7 @@ Daniel Barkalow <barkalow@iabervon.org>
 David D. Kilzer <ddkilzer@kilzer.net>
 David Kågedal <davidk@lysator.liu.se>
 David S. Miller <davem@davemloft.net>
+Deskin Miller <deskinm@umich.edu>
 Dirk Süsserott <newsletter@dirk.my1.cc>
 Fredrik Kuivinen <freku045@student.liu.se>
 H. Peter Anvin <hpa@bonde.sc.orionmulti.com>
@@ -60,6 +62,7 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Uwe Kleine-König <uzeisberger@io.fsforth.de>
 Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
 Ville Skyttä <scop@xemacs.org>
+Vitaly "_Vi" Shukela <public_vi@tut.by>
 William Pursell <bill.pursell@gmail.com>
 YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
 anonymous <linux@horizon.com>

-Original file line number
+Diff line change
 # same person appearing not to be so.
+#
 +Alex Bennée <[email protected]>
 Alexander Gavrilov <[email protected]>
 Aneesh Kumar K.V <[email protected]>
 Brian M. Carlson <[email protected]>
 David D. Kilzer <[email protected]>
 David Kågedal <[email protected]>
 David S. Miller <[email protected]>
 +Deskin Miller <[email protected]>
 Dirk Süsserott <[email protected]>
 Fredrik Kuivinen <[email protected]>
 H. Peter Anvin <[email protected]>
 Uwe Kleine-König <[email protected]>
 Uwe Kleine-König <[email protected]>
 Ville Skyttä <[email protected]>
 +Vitaly "_Vi" Shukela <[email protected]>
 William Pursell <[email protected]>
 YOSHIFUJI Hideaki <[email protected]>
 anonymous <[email protected]>