X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.mailmap;h=2d6ce0ac11e4b1d6672d0add1588d6998848fb23;hb=79f1529ae03f9f85c0844eaa08e84abe7ba0882f;hp=9c476c3c2636ea3a355fc46a79c2a519c38150ec;hpb=f3ae370a36c2103ce994865f5c3713377a9d0ae9;p=mesa.git

diff --git a/.mailmap b/.mailmap
index 9c476c3c263..2d6ce0ac11e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -88,9 +88,11 @@ Carl-Philip Hänsch <cphaensch@googlemail.com> Carl-Philip Haensch <s3734770@mai
 Carl-Philip Hänsch <cphaensch@googlemail.com> Carl-Philip Haensch <carli@carli-laptop.(none)>
 Carl-Philip Hänsch <cphaensch@googlemail.com> Carl-Philip Haensch <Carl-Philip.Haensch@mailbox.tu-dresden.de>
 
-Chad Versace <chad.versace@intel.com> <chad@chad-versace.us>
-Chad Versace <chad.versace@intel.com> <Chad Versace chad@chad-versace.us>
-Chad Versace <chad.versace@intel.com> <chad.versace@linux.intel.com>
+Chad Versace <chadversary@chromium.org> <chad@kiwitree.net>
+Chad Versace <chadversary@chromium.org> <chad@chad-versace.us>
+Chad Versace <chadversary@chromium.org> <Chad Versace chad@chad-versace.us>
+Chad Versace <chadversary@chromium.org> <chad.versace@intel.com>
+Chad Versace <chadversary@chromium.org> <chad.versace@linux.intel.com>
 
 Chia-I Wu <olvaffe@gmail.com> <olv@lunarg.com>
 Chia-I Wu <olvaffe@gmail.com> Chia-Wu <olvaffe@gmail.com>
@@ -143,9 +145,16 @@ 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>
 
+Eric Engestrom <eric@engestrom.ch> <eric.engestrom@imgtec.com>
+
 Eugeni Dodonov <eugeni.dodonov@intel.com> <eugeni@mandriva.com>
 
 Fabian Bieler <der.fabe@gmx.net> <fabianbieler@fastmail.fm>
@@ -256,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>