X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=.mailmap;h=02dccfc1aee7ff5fd29007bf9daad769da5ea5e4;hb=0509efb7e921ca1a274bb6b9702976e74f6b2b67;hp=e1c666334ae3e618d63d2c65da59df1e24e1f9ad;hpb=740f41d3cbefe2068247852220226c2c3b287249;p=oweals%2Fu-boot.git

diff --git a/.mailmap b/.mailmap
index e1c666334a..02dccfc1ae 100644
--- a/.mailmap
+++ b/.mailmap
@@ -12,8 +12,12 @@ Allen Martin <amartin@nvidia.com>
 Andreas Bießmann <andreas.devel@googlemail.com>
 Aneesh V <aneesh@ti.com>
 Dirk Behme <dirk.behme@googlemail.com>
-Fabio Estevam <fabio.estevam@freescale.com>
-Jagannadha Sutradharudu Teki <402jagan@gmail.com>
+Fabio Estevam <fabio.estevam@nxp.com>
+Jagan Teki <402jagan@gmail.com>
+Jagan Teki <jaganna@gmail.com>
+Jagan Teki <jaganna@xilinx.com>
+Jagan Teki <jagannadh.teki@gmail.com>
+Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
 Markus Klotzbuecher <mk@denx.de>
 Prabhakar Kushwaha <prabhakar@freescale.com>
 Rajeshwari Shinde <rajeshwari.s@samsung.com>
@@ -24,4 +28,5 @@ Stefano Babic <sbabic@denx.de>
 TsiChung Liew <Tsi-Chung.Liew@freescale.com>
 Wolfgang Denk <wdenk>
 York Sun <yorksun@freescale.com>
+York Sun <york.sun@nxp.com>
 Łukasz Majewski <l.majewski@samsung.com>