summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorAndres Gomez <agomez@igalia.com>2021-02-02 21:50:46 +0200
committerMarge Bot <eric+marge@anholt.net>2021-03-05 16:35:07 +0000
commit00aefdfea6d6e9774c4f1ae077a6dea551df5354 (patch)
treed8c55afff84add027ef0ecc1ee3d725b8ce1e527 /.mailmap
parent028ae10694e899468edb169780294f77b37c46d0 (diff)
.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>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 742e9c0b353..9313abf3faa 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>