Merge branch 'sb/mailmap-updates'

gitster · gitster · commit 4fcd30df85a5 · 2013-08-05T10:11:14.000-07:00
* sb/mailmap-updates:
  .mailmap: Multiple addresses of Michael S. Tsirkin
diff --git 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>

-Original file line number
+Diff line change
 Matthias Urlichs <[email protected]> <[email protected]>
 Michael Coleman <[email protected]>
 Michael J Gruber <[email protected]> <[email protected]>
 +Michael S. Tsirkin <[email protected]> <[email protected]>
 +Michael S. Tsirkin <[email protected]> <[email protected]>
 +Michael S. Tsirkin <[email protected]> <[email protected]>
 Michael W. Olson <[email protected]>
 Michael Witten <[email protected]> <[email protected]>
 Michael Witten <[email protected]> <[email protected]>