From 00aefdfea6d6e9774c4f1ae077a6dea551df5354 Mon Sep 17 00:00:00 2001
From: Andres Gomez <agomez@igalia.com>
Date: Tue, 2 Feb 2021 21:50:46 +0200
Subject: [PATCH] .mailmap: resolve duplicates for Lin Johnson

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 742e9c0b353bd..9313abf3faa10 100644
--- a/.mailmap
+++ b/.mailmap
@@ -382,6 +382,8 @@ Krzesimir Nowak <qdlacz@gmail.com> <krzesimir@kinvolk.io>
 
 Li Peng <peng.li@intel.com> <peng.li@linux.intel.com>
 
+Lin Johnson <johnson.lin@intel.com> Johnson Lin <johnson.lin@intel.com>
+
 Lionel Landwerlin <lionel.g.landwerlin@intel.com> <llandwerlin@gmail.com>
 
 Liviu Prodea <liviuprodea@yahoo.com>