X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.mailmap;h=756b06656a36f54ce7740c6784a9447a8af3a972;hb=0d241085f723402120b4b47e939fe77020a16d80;hp=10811c065af2ee5fbc58c5f9d68df41281b50f4c;hpb=9c3392cb3a23f6e681b9110284417db5b34e3793;p=mesa.git

diff --git a/.mailmap b/.mailmap
index 10811c065af..756b06656a3 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>
 
@@ -111,8 +113,8 @@ Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> Christop
 Claudio Ciccani <klan@directfb.org> <klan@users.sf.net>
 Claudio Ciccani <klan@directfb.org> <klan@users.sourceforge.net>
 
-Connor Abbott <connor.abbott@intel.com> <connor.w.abbott@intel.com>
-Connor Abbott <connor.abbott@intel.com> <cwabbott0@gmail.com>
+Connor Abbott <cwabbott0@gmail.com> <connor.w.abbott@intel.com>
+Connor Abbott <cwabbott0@gmail.com> <connor.abbott@intel.com>
 
 Corbin Simpson <MostAwesomeDude@gmail.com> <mostawesomed...@gmail.com>
 Corbin Simpson <MostAwesomeDude@gmail.com> <mostawesomedude@gmail.com>
@@ -138,9 +140,11 @@ 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>
 
@@ -168,12 +172,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>
 
@@ -250,11 +253,11 @@ Keith Packard <keithp@keithp.com> <keithp@neko.keithp.com>
 Keith Whitwell <keithw@vmware.com> <keith@tungstengraphics.com>
 Keith Whitwell <keithw@vmware.com> keithw <keithw@keithw-laptop.(none)>
 
-Kristian Høgsberg <krh@redhat.com> <krh@bitplanet.net>
-Kristian Høgsberg <krh@redhat.com> <krh@hinata.boston.redhat.com>
-Kristian Høgsberg <krh@redhat.com> <krh@sasori.boston.redhat.com>
-Kristian Høgsberg <krh@redhat.com> <krh@temari.boston.redhat.com>
-Kristian Høgsberg <krh@redhat.com> <krh@bitplanet.net>
+Kristian Høgsberg <krh@bitplanet.net> <krh@redhat.com>
+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>
 
 Krzesimir Nowak <qdlacz@gmail.com> <krzesimir@kinvolk.io>
 
@@ -262,8 +265,9 @@ Li Peng <peng.li@intel.com> <peng.li@linux.intel.com>
 
 Lucas Stach <dev@lynxeye.de> <l.stach@pengutronix.de>
 
-Maarten Lankhorst <maarten.lankhorst@canonical.com> <dev@mblankhorst.nl>
-Maarten Lankhorst <maarten.lankhorst@canonical.com> <m.b.lankhorst@gmail.com>
+Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <dev@mblankhorst.nl>
+Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <m.b.lankhorst@gmail.com>
+Maarten Lankhorst <maarten.lankhorst@ubuntu.com> <maarten.lankhorst@canonical.com>
 
 Maciej Cencora <m.cencora@gmail.com> <maciej@osiris.(none)>
 
@@ -274,7 +278,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>