X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=.mailmap;h=bd7267241a8effa4479227739d15d55f69c413c2;hb=0778e7c50ba1904943a1d6b5194c29d1fee33334;hp=c7bb0efde84d25154db917f4bc084f3b0a457445;hpb=b685c7348c521b14591a49ec6b78a2ad28a176e0;p=people%2Fms%2Fu-boot.git

diff --git a/.mailmap b/.mailmap
index c7bb0efde8..bd7267241a 100644
--- a/.mailmap
+++ b/.mailmap
@@ -10,17 +10,21 @@
 
 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>
+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>
+Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
 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>