From 6c9660e424243c36673c0054c5559fd97bbf4960 Mon Sep 17 00:00:00 2001
From: Andres Gomez <agomez@igalia.com>
Date: Tue, 2 Feb 2021 21:50:08 +0200
Subject: [PATCH] .mailmap: resolve duplicates for James Xiong

Signed-off-by: Andres Gomez <agomez@igalia.com>
Acked-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8837>
---
 .mailmap | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.mailmap b/.mailmap
index e2c402896950e..4d48cf814ab68 100644
--- a/.mailmap
+++ b/.mailmap
@@ -280,6 +280,8 @@ Jakub Bogusz <qboosh@pld-linux.org> <gboosh@pld-linux.org>
 
 James Legg <jlegg@feralinteractive.com> <lankyleggy@gmail.com>
 
+James Xiong <james.xiong@intel.com> Xiong, James <james.xiong@intel.com>
+
 James Zhu <James.Zhu@amd.com>
 
 Jan Beich <jbeich@freebsd.org> <jbeich@FreeBSD.org>