From: Stefan Beller <stefanbeller@googlemail.com>
Date: Sat, 3 Aug 2013 11:54:03 +0000 (+0200)
Subject: .mailmap: Multiple addresses of Michael S. Tsirkin
X-Git-Tag: v1.8.4-rc2~4^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/487e5707852cca03f924ea4dcfbcad1030db58d8

.mailmap: Multiple addresses of Michael S. Tsirkin

Acked-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Stefan Beller <stefanbeller@googlemail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/.mailmap b/.mailmap
index 40e787a463..ee2f2dca31 100644
--- a/.mailmap
+++ b/.mailmap
@@ -130,6 +130,9 @@ Matthias Urlichs <matthias@urlichs.de> <smurf@kiste.(none)>
 Matthias Urlichs <matthias@urlichs.de> <smurf@smurf.noris.de>
 Michael Coleman <tutufan@gmail.com>
 Michael J Gruber <git@drmicha.warpmail.net> <michaeljgruber+gmane@fastmail.fm>
+Michael S. Tsirkin <mst@kernel.org> <mst@redhat.com>
+Michael S. Tsirkin <mst@kernel.org> <mst@mellanox.co.il>
+Michael S. Tsirkin <mst@kernel.org> <mst@dev.mellanox.co.il>
 Michael W. Olson <mwolson@gnu.org>
 Michael Witten <mfwitten@gmail.com> <mfwitten@MIT.EDU>
 Michael Witten <mfwitten@gmail.com> <mfwitten@mit.edu>