etnaviv: drm: Don't miscalculate timeout

[mesa.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index cb8a27bef74e580568023128fe79f183f49f32d8..7f0a3fbfd7001eaddafe4b6471287ded3920a41c 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -133,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>
 
@@ -175,6 +175,8 @@ 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>
@@ -193,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>
 
@@ -463,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>