Mesa (master): .mailmap: fix my main address

[Marek Olšák]

Module: Mesa
Branch: master
Commit: 5d85a21feee0a3cc11b2121b161c097bd8fb6b3f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5d85a21feee0a3cc11b2121b161c097bd8fb6b3f

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Jun 22 14:45:04 2016 +0200

.mailmap: fix my main address

---

 .mailmap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 3c4add7..c614dec 100644
--- a/.mailmap
+++ b/.mailmap
@@ -274,7 +274,7 @@ Marc Dietrich <marvin24 at gmx.de> marvin24 <marvin24 at gmx.de>
 
 Marcin Ślusarz <marcin.slusarz at gmail.com> Marcin Slusarz <marcin.slusarz at gmail.com>
 
-Marek Olšák <marek.olsak at amd.com> <maraeo at gmail.com>
+Marek Olšák <maraeo at gmail.com> <marek.olsak at amd.com>
 
 Mario Kleiner <mario.kleiner.de at gmail.com> kleinerm <mario.kleiner at tuebingen.mpg.de>
 Mario Kleiner <mario.kleiner.de at gmail.com> <mario.kleiner at tuebingen.mpg.de>