X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=.mailmap;h=3a624eabc32b9698b6701e133acbf575d02aa889;hb=f48fd68887a03756658a46486a5dd1301c5a655f;hp=2c658f42f52dcb54cdc6e0011a12be8878747a23;hpb=e27e609bbf81271318d99f2643f378f3fde6c6c6;p=git.git

diff --git a/.mailmap b/.mailmap
index 2c658f42f..3a624eabc 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,10 +27,13 @@ Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
 Ramsay Allan Jones <ramsay@ramsay1.demon.co.uk>
 René Scharfe <rene.scharfe@lsrfire.ath.cx>
 Robert Fitzsimons <robfitz@273k.net>
+Sam Vilain <sam@vilain.net>
 Santi Béjar <sbejar@gmail.com>
 Sean Estabrooks <seanlkml@sympatico.ca>
 Shawn O. Pearce <spearce@spearce.org>
+Theodore Ts'o <tytso@mit.edu>
 Tony Luck <tony.luck@intel.com>
+Uwe Kleine-König <zeisberg@informatik.uni-freiburg.de>
 Ville Skyttä <scop@xemacs.org>
 YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
 anonymous <linux@horizon.com>