X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=.mailmap;h=14b5ad7e5c40f9260abb68e6608ed87893f24e52;hb=2be296538e2e9d2893dc495b3fc8f9f6acb1454c;hp=e1c666334ae3e618d63d2c65da59df1e24e1f9ad;hpb=c23154aab5825fec81d5500c53eaa686646c76b5;p=oweals%2Fu-boot.git

diff --git a/.mailmap b/.mailmap
index e1c666334a..14b5ad7e5c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,13 +10,20 @@
 
 Allen Martin <amartin@nvidia.com>
 Andreas Bießmann <andreas.devel@googlemail.com>
+Andreas Bießmann <andreas@biessmann.org>
 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>
+Ricardo Ribalda <ricardo.ribalda@uam.es>
+Ricardo Ribalda <ricardo.ribalda@gmail.com>
 Sandeep Paulraj <s-paulraj@ti.com>
 Shaohui Xie <Shaohui.Xie@freescale.com>
 Stefan Roese <stroese>
@@ -24,4 +31,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>