From: Edward O'Callaghan <funfunctor@folklore1984.net>
Date: Wed, 22 Jun 2016 10:42:30 +0000 (+1000)
Subject: .mailmap: Fixup my email address
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f3ae370a36c2103ce994865f5c3713377a9d0ae9;p=mesa.git

.mailmap: Fixup my email address

Signed-off-by: Edward O'Callaghan <funfunctor@folklore1984.net>
---

diff --git a/.mailmap b/.mailmap
index c614dec8657..9c476c3c263 100644
--- a/.mailmap
+++ b/.mailmap
@@ -138,6 +138,8 @@ 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.l.velikov@gmail.com> <emil.velikov@collabora.com>