Merge branch 'sb/mailmap-updates'

* sb/mailmap-updates: .mailmap: Multiple addresses of Michael S. Tsirkin

Merge branch 'sb/mailmap-updates'
* sb/mailmap-updates: .mailmap: Multiple addresses of Michael S. Tsirkin
4fcd30df · Junio C Hamano · d6f3ab57 · 487e5707 · 4fcd30df
隐藏空白更改
内联并排

Showing with 3 addition and 0 deletion

.mailmap .mailmap +3 -0

未找到文件。
--- 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>