X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.mailmap;h=2d6ce0ac11e4b1d6672d0add1588d6998848fb23;hb=d6d83b34ee3486d2154c1c929900d329448cb6c0;hp=ff60ba7ea8548ee2c6b02da71f7b40d5808fb6b8;hpb=6332893594924a14e984aee2b75f7a5263816b19;p=mesa.git

diff --git a/.mailmap b/.mailmap
index ff60ba7ea85..2d6ce0ac11e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -145,6 +145,11 @@ Edward O'Callaghan <funfunctor@folklore1984.net> <eocallaghan@alterapraxis.com>
 Emeric Grange <emeric.grange@gmail.com> Emeric <emeric.grange@gmail.com>
 
 Emil Velikov <emil.l.velikov@gmail.com> <emil.velikov@collabora.com>
+Emil Velikov <emil.l.velikov@gmail.com> <emil.veliko@collabora.com>
+Emil Velikov <emil.l.velikov@gmail.com> <emil.velikov@collabora.co.uk>
+Emil Velikov <emil.l.velikov@gmail.com> <emil.veliikov@collabora.com>
+Emil Velikov <emil.l.velikov@gmail.com> <emil.velikov@gmail.com>
+Emil Velikov <emil.l.velikov@gmail.com> <emmil.velikov@collabora.com>
 
 Eric Anholt <eric@anholt.net> Eric Anholt <anholt@FreeBSD.org>
 
@@ -260,6 +265,9 @@ Kristian Høgsberg <krh@bitplanet.net> <krh@hinata.boston.redhat.com>
 Kristian Høgsberg <krh@bitplanet.net> <krh@sasori.boston.redhat.com>
 Kristian Høgsberg <krh@bitplanet.net> <krh@temari.boston.redhat.com>
 Kristian Høgsberg <krh@bitplanet.net> <kristian.h.kristensen@intel.com>
+Kristian Høgsberg <krh@bitplanet.net> <hoegsberg@chromium.org>
+Kristian Høgsberg <krh@bitplanet.net> <hoegsberg@google.com>
+Kristian Høgsberg <krh@bitplanet.net> <hoegsberg@gmail.com>
 
 Krzesimir Nowak <qdlacz@gmail.com> <krzesimir@kinvolk.io>