X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=.mailmap;h=c7a3a75f33f726e6b5c673478d4155fc8c050248;hb=ed35dece2776b0b83d7a35c84ab961668ec11ef4;hp=2c658f42f52dcb54cdc6e0011a12be8878747a23;hpb=2cf0223ba48ae51af03de486e119fd7a36e1b0ee;p=git.git

diff --git a/.mailmap b/.mailmap
index 2c658f42f..c7a3a75f3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -30,7 +30,9 @@ Robert Fitzsimons <robfitz@273k.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>