From: Anthony Liguori <anthony@codemonkey.ws>
Date: Thu, 5 Sep 2013 14:40:02 +0000 (-0500)
Subject: Update mailmap
X-Git-Tag: v1.7.0-rc0~134
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=863a83415750a2ee75ac1fb31405c11e71bf990b;p=thirdparty%2Fqemu.git

Update mailmap

This makes get_maintainers.pl behave a little better.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
---

diff --git a/.mailmap b/.mailmap
index 7b91a95d95d..28defa1b2c5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -3,6 +3,7 @@
 #
 Andrzej Zaborowski <balrogg@gmail.com> balrog <balrog@c046a42c-6fe2-441c-8c8c-71466251a162>
 Anthony Liguori <anthony@codemonkey.ws> aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
+Anthony Liguori <anthony@codemonkey.ws> Anthony Liguori <aliguori@us.ibm.com>
 Aurelien Jarno <aurelien@aurel32.net> aurel32 <aurel32@c046a42c-6fe2-441c-8c8c-71466251a162>
 Blue Swirl <blauwirbel@gmail.com> blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162>
 Edgar E. Iglesias <edgar.iglesias@gmail.com> edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>