Mesa (master): .mailmap: Fix my email addresses.

[Maarten Lankhorst]

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

Author: Maarten Lankhorst <maarten.lankhorst at ubuntu.com>
Date:   Fri May 13 12:27:45 2016 +0200

.mailmap: Fix my email addresses.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst at ubuntu.com>

---

 .mailmap | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.mailmap b/.mailmap
index 0d6ab33..373ca56 100644
--- a/.mailmap
+++ b/.mailmap
@@ -262,8 +262,9 @@ Li Peng <peng.li at intel.com> <peng.li at linux.intel.com>
 
 Lucas Stach <dev at lynxeye.de> <l.stach at pengutronix.de>
 
-Maarten Lankhorst <maarten.lankhorst at canonical.com> <dev at mblankhorst.nl>
-Maarten Lankhorst <maarten.lankhorst at canonical.com> <m.b.lankhorst at gmail.com>
+Maarten Lankhorst <maarten.lankhorst at ubuntu.com> <dev at mblankhorst.nl>
+Maarten Lankhorst <maarten.lankhorst at ubuntu.com> <m.b.lankhorst at gmail.com>
+Maarten Lankhorst <maarten.lankhorst at ubuntu.com> <maarten.lankhorst at canonical.com>
 
 Maciej Cencora <m.cencora at gmail.com> <maciej at osiris.(none)>