X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.mailmap;h=ff60ba7ea8548ee2c6b02da71f7b40d5808fb6b8;hb=f24bf4521023658012b2636a24cf2387fd55695a;hp=373ca56c34eb01312fe8539ccd1594e2c9de38a4;hpb=ff5c3126235804e963abaa94e5ea50d1295cdd5f;p=mesa.git

diff --git a/.mailmap b/.mailmap
index 373ca56c34e..ff60ba7ea85 100644
--- a/.mailmap
+++ b/.mailmap
@@ -88,12 +88,14 @@ 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 <olv@lunarg.com> <olvaffe@gmail.com>
-Chia-I Wu <olv@lunarg.com> Chia-Wu <olvaffe@gmail.com>
+Chia-I Wu <olvaffe@gmail.com> <olv@lunarg.com>
+Chia-I Wu <olvaffe@gmail.com> Chia-Wu <olvaffe@gmail.com>
 
 Chih-Wei Huang <cwhuang@linux.org.tw> Chih-Wei Huang <cwhuang@android-x86.org>
 
@@ -138,12 +140,16 @@ Dmitry Cherkassov <dcherkassov@gmail.com> Dmitry Cherkasov <dcherkassov@gmail.co
 
 Dylan Baker <dylanx.c.baker@intel.com> <baker.dylan.c@gmail.com>
 
+Edward O'Callaghan <funfunctor@folklore1984.net> <eocallaghan@alterapraxis.com>
+
 Emeric Grange <emeric.grange@gmail.com> Emeric <emeric.grange@gmail.com>
 
-Emil Velikov <emil.velikov@collabora.com> <emil.l.velikov@gmail.com>
+Emil Velikov <emil.l.velikov@gmail.com> <emil.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>
@@ -168,12 +174,11 @@ Hui Qi Tay <hqtay@vmware.com> <tayhuiqithq@gmail.com>
 Ian Romanick <ian.d.romanick@intel.com> <idr@freedesktop.org>
 Ian Romanick <ian.d.romanick@intel.com> <idr@us.ibm.com>
 
-Jakob Bornecrantz <jakob@vmware.com> <jakob@vmware.com>
-Jakob Bornecrantz <jakob@vmware.com> <jakob@aurora.(none)>
-Jakob Bornecrantz <jakob@vmware.com> <jakob@aurora.walkyrie.se>
-Jakob Bornecrantz <jakob@vmware.com> <jakob@tungstengraphics.com>
-Jakob Bornecrantz <jakob@vmware.com> <wallbraker 'at' gmail 'dot' com>
-Jakob Bornecrantz <jakob@vmware.com> <wallbraker@gmail.com>
+Jakob Bornecrantz <wallbraker@gmail.com> <jakob@vmware.com>
+Jakob Bornecrantz <wallbraker@gmail.com> <jakob@aurora.(none)>
+Jakob Bornecrantz <wallbraker@gmail.com> <jakob@aurora.walkyrie.se>
+Jakob Bornecrantz <wallbraker@gmail.com> <jakob@tungstengraphics.com>
+Jakob Bornecrantz <wallbraker@gmail.com> <wallbraker 'at' gmail 'dot' com>
 
 Jakub Bogusz <qboosh@pld-linux.org> <gboosh@pld-linux.org>
 
@@ -275,7 +280,7 @@ Marc Dietrich <marvin24@gmx.de> marvin24 <marvin24@gmx.de>
 
 Marcin Ślusarz <marcin.slusarz@gmail.com> Marcin Slusarz <marcin.slusarz@gmail.com>
 
-Marek Olšák <marek.olsak@amd.com> <maraeo@gmail.com>
+Marek Olšák <maraeo@gmail.com> <marek.olsak@amd.com>
 
 Mario Kleiner <mario.kleiner.de@gmail.com> kleinerm <mario.kleiner@tuebingen.mpg.de>
 Mario Kleiner <mario.kleiner.de@gmail.com> <mario.kleiner@tuebingen.mpg.de>