From 5d85a21feee0a3cc11b2121b161c097bd8fb6b3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Wed, 22 Jun 2016 14:45:04 +0200
Subject: .mailmap: fix my main address

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

(limited to '.mailmap')

diff --git a/.mailmap b/.mailmap
index 3c4add7..c614dec 100644
--- a/.mailmap
+++ b/.mailmap
@@ -274,7 +274,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>
-- 
cgit v1.1