X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.mailmap;h=7f0a3fbfd7001eaddafe4b6471287ded3920a41c;hb=20659f18947a48714fa8ce0f433304746541e110;hp=3c4add7a23e84c6ee36e6bc094ec6c73bc893404;hpb=d519f59a9f44354e433bb71b56934a18e43446f3;p=mesa.git

diff --git a/.mailmap b/.mailmap
index 3c4add7a23e..7f0a3fbfd70 100644
--- a/.mailmap
+++ b/.mailmap
@@ -26,6 +26,8 @@ Alexander Monakov <amonakov@gmail.com> <amonakov@ispras.ru>
 
 Alexander von Gluck IV <kallisti5@unixzen.com> Alexander von Gluck <kallisti5@unixzen.com>
 
+Alexandros Frantzis <alexandros.frantzis@collabora.com> <Alexandros.Frantzis@canonical.com>
+
 Alex Corscadden <alexc@vmware.com> <alexc@alexc-dev1.prom.eng.vmware.com>
 Alex Corscadden <alexc@vmware.com> <alexc@alexc-dev1.vmware.com>
 
@@ -50,6 +52,8 @@ Andrew Randrianasulu <randrianasulu@gmail.com> <randrik@mail.ru>
 
 Arthur Huillet <arthur.huillet@free.fr> Arthur HUILLET <arthur.huillet@free.fr>
 
+Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl> <basni@chromium.org>
+
 Benjamin Franzke <benjaminfranzke@googlemail.com> ben <benjaminfranzke@googlemail.com>
 
 Ben Skeggs <bskeggs@redhat.com> <darktama@beleth.(none)>
@@ -88,9 +92,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>
@@ -127,8 +133,8 @@ David Miller <davem@davemloft.net> David S. Miller <davem@davemloft.net>
 David Miller <davem@davemloft.net> Dave Miller <davem@davemloft.net>
 David Miller <davem@davemloft.net> davem69 <davem69>
 
-David Heidelberger <david.heidelberger@ixit.cz> David Heidelberg <david@ixit.cz>
-David Heidelberger <david.heidelberger@ixit.cz> <d.okias@gmail.com>
+David Heidelberg <david@ixit.cz> David Heidelberger <david.heidelberger@ixit.cz>
+David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
 
 David Reveman <reveman@chromium.org> <c99drn@cs.umu.se>
 
@@ -138,12 +144,24 @@ 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>
+
+Elie Tournier <tournier.elie@gmail.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>
+Eric Engestrom <eric@engestrom.ch> <eric.engestrom@intel.com>
+
 Eugeni Dodonov <eugeni.dodonov@intel.com> <eugeni@mandriva.com>
 
 Fabian Bieler <der.fabe@gmx.net> <fabianbieler@fastmail.fm>
@@ -151,10 +169,14 @@ Fabian Bieler <der.fabe@gmx.net> <&lt;der.fabe@gmx.net&gt>
 
 Feng, Haitao <haitao.feng@intel.com> Haitao Feng <haitao.feng@intel.com>
 
+Frank Binns <frank.binns@imgtec.com> <francisbinns@gmail.com>
+
 Frank Henigman <fjhenigman@google.com> <fjhenigman@chromium.org>
 
 George Sapountzis <gsapountzis@gmail.com> George Sapountzis <gsap7@yahoo.gr>
 
+Gert Wollny <gert.wollny@collabora.com> <gw.fossdev@gmail.com>
+
 Gwenole Beauchesne <gwenole.beauchesne@intel.com> <gb.devel@gmail.com>
 
 Hamish Marson <hmarson@users.sourceforge.net> hmarson <hmarson>
@@ -173,6 +195,8 @@ 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>
+Jakob Bornecrantz <wallbraker@gmail.com> <jakob.bornecrantz@collabora.com>
+Jakob Bornecrantz <wallbraker@gmail.com> <jakob@collabora.com>
 
 Jakub Bogusz <qboosh@pld-linux.org> <gboosh@pld-linux.org>
 
@@ -254,6 +278,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>
 
@@ -274,7 +301,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>
@@ -314,6 +341,7 @@ Michel Dänzer <michel@daenzer.net> <daenzer@vmware.com>
 Michel Dänzer <michel@daenzer.net> <michel@tungstengraphics.com>
 Michel Dänzer <michel@daenzer.net> Michel Daenzer <michel.daenzer@amd.com>
 Michel Dänzer <michel@daenzer.net> Michel Daenzer <daenzer@localhost.(none)>
+Michel Dänzer <michel@daenzer.net> <mdaenzer@redhat.com>
 
 Mike Kaplinskiy <mike.kaplinskiy@gmail.com> Mike Kaplinksiy <mike.kaplinskiy@gmail.com>
 Mike Kaplinskiy <mike.kaplinskiy@gmail.com> <mike.kaplinskiy@gmai.com>
@@ -439,6 +467,8 @@ Tom Fogal <tfogal@alumni.unh.edu> <tfogal@sci.utah.edu>
 Tom Stellard <thomas.stellard@amd.com> <tstellar@gmail.com>
 Tom Stellard <thomas.stellard@amd.com> Thomas Stellard <tom.stellard@amd.com>
 
+Tomeu Vizoso <tomeu.vizoso@collabora.com> <tomeu@tomeuvizoso.net>
+
 Tormod Volden <debian.tormod@gmail.com> <lists.tormod@gmail.com>
 
 Török Edwin <edwin+mesa@etorok.net> Török Edvin <edwintorok@gmail.com>