#\r
-# This list is used by git-shortlog to fix a few botched name translations\r
-# in the git archive, either because the author's full name was messed up\r
-# and/or not always written the same way, making contributions from the\r
-# same person appearing not to be so or badly displayed.\r
+# This list is used by git-shortlog to update a few name translations\r
+# in the git archive to adjust for job changes or incorrect/inconsistent\r
+# name usage.\r
#\r
# Please keep this file sorted alphabetically, and email in lowercase.\r
# The format used is:\r
Eric Dong <eric.dong@intel.com> <ydong10@6f19259b-4bc3-4df7-8a09-765794883524>\r
Eric Dong <eric.dong@intel.com> <ydong10@Edk2>\r
Erik Bjorge <erik.c.bjorge@intel.com> <geekboy15a@6f19259b-4bc3-4df7-8a09-765794883524>\r
+Eugene Cohen <eugene@nuviainc.com>\r
+Eugene Cohen <eugene@nuviainc.com> <eugene@hp.com>\r
Hao A Wu <hao.a.wu@intel.com>\r
Hao A Wu <hao.a.wu@intel.com> <hwu1225@Edk2>\r
Hot Tian <hot.tian@intel.com>\r
Jim Dailey <Jim.Dailey@Dell.com> <Jim_Dailey@Dell.com>\r
Laszlo Ersek <lersek@redhat.com> <lersek@6f19259b-4bc3-4df7-8a09-765794883524>\r
Laszlo Ersek <lersek@redhat.com> <lersek@Edk2>\r
+Liming Gao <gaoliming@byosoft.com.cn>\r
Liming Gao <liming.gao@intel.com> <Gao, Liming liming.gao@intel.com>\r
Liming Gao <liming.gao@intel.com> <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>\r
Liming Gao <liming.gao@intel.com> <lgao4@Edk2>\r
Marvin Häuser <Marvin.Haeuser@outlook.com>\r
Marvin Häuser <Marvin.Haeuser@outlook.com> edk2-devel <edk2-devel-bounces@lists.01.org>\r
Marvin Häuser <mhaeuser@outlook.de>\r
+Matt DeVillier <matt.devillier@gmail.com>\r
Maurice Ma <maurice.ma@intel.com>\r
Michael Kubacki <michael.a.kubacki@intel.com>\r
Michael Kubacki <michael.a.kubacki@intel.com> </o=Intel/ou=External (FYDIBOHF25SPDLT)/cn=Recipients/cn=3c8b0226e75f4ab08d20c151cb7a8a72>\r
Ray Ni <ray.ni@intel.com> <ruiyu.ni@intel.com>\r
Ray Ni <ray.ni@intel.com> <Ruiyu.ni@Intel.com>\r
Ray Ni <ray.ni@intel.com> <ruyu.ni@intel.com>\r
+Rebecca Cran <rebecca@bluestop.org>\r
+Rebecca Cran <rebecca@bsdio.com>\r
Samer El-Haj-Mahmoud <samer@elhajmahmoud.com> <elhaj@hpe.com>\r
Samer El-Haj-Mahmoud <samer@elhajmahmoud.com> <Samer El-Haj-Mahmoud elhaj@hp.com>\r
Shenglei Zhang <shenglei.zhang@intel.com>\r
Star Zeng <star.zeng@intel.com>\r
Star Zeng <star.zeng@intel.com> <lzeng14@6f19259b-4bc3-4df7-8a09-765794883524>\r
Star Zeng <star.zeng@intel.com> <lzeng14@Edk2>\r
+Tom Lendacky <thomas.lendacky@amd.com>\r
Vitaly Cheptsov <vit9696@protonmail.com> Vitaly Cheptsov via Groups.Io <vit9696=protonmail.com@groups.io>\r
Vladimir Olovyannikov <vladimir.olovyannikov@broadcom.com> Vladimir Olovyannikov via edk2-devel <edk2-devel@lists.01.org>\r
+Wei6 Xu <wei6.xu@intel.com>\r
+Yonghong Zhu <yonghong.zhu@intel.com>\r
+Yonghong Zhu <yonghong.zhu@intel.com> <yzhu52@Edk2>\r
+Yu-Chen Lin <yuchenlin@synology.com>\r
+Zhichao Gao <zhichao.gao@intel.com>\r
+Zhiguang Liu <zhiguang.liu@intel.com>\r