Merge branch 'master' of git://git.denx.de/u-boot-video

[u-boot] / .mailmap

diff --git a/.mailmap b/.mailmap
index c7bb0efde84d25154db917f4bc084f3b0a457445..02dccfc1aee7ff5fd29007bf9daad769da5ea5e4 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -12,7 +12,7 @@ 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>
+Fabio Estevam <fabio.estevam@nxp.com>
 Jagan Teki <402jagan@gmail.com>
 Jagan Teki <jaganna@gmail.com>
 Jagan Teki <jaganna@xilinx.com>