configs: Resync with savedefconfig

[J-u-boot.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index c7bb0efde84d25154db917f4bc084f3b0a457445..63afce3774a5ac96475030c5b3be23ea6e9bce0c 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -4,23 +4,35 @@
 # and/or not always written the same way, making contributions from the
 # same person appearing not to be so or badly displayed.
 #
+# This file is also used by scripts/get_maintainer.pl.
+#
 # This file can be modified by hand or updated by the following command:
 #  scripts/mailmapper > tmp; mv tmp .mailmap
 #
+# Entries in this file take one of the following forms:
+# Proper Name <[email protected]>
+# <[email protected]> <[email protected]>
+# Proper Name <[email protected]> <[email protected]>
+# Proper Name <[email protected]> Commit Name <[email protected]>
 
+Alexander Graf <[email protected]> <[email protected]>
 Allen Martin <[email protected]>
 Andreas Bießmann <[email protected]>
+Andreas Bießmann <[email protected]>
 Aneesh V <[email protected]>
 Dirk Behme <[email protected]>
-Fabio Estevam <fabio.estevam@freescale.com>
+Fabio Estevam <fabio.estevam@nxp.com>
 Jagan Teki <[email protected]>
 Jagan Teki <[email protected]>
 Jagan Teki <[email protected]>
 Jagan Teki <[email protected]>
 Jagan Teki <[email protected]>
 Markus Klotzbuecher <[email protected]>
+Paul Burton <[email protected]> <[email protected]>
 Prabhakar Kushwaha <[email protected]>
 Rajeshwari Shinde <[email protected]>
+Ricardo Ribalda <[email protected]> <[email protected]>
+Ricardo Ribalda <[email protected]> <[email protected]>
 Sandeep Paulraj <[email protected]>
 Shaohui Xie <[email protected]>
 Stefan Roese <stroese>
@@ -30,3 +42,5 @@ Wolfgang Denk <wdenk>
 York Sun <[email protected]>
 York Sun <[email protected]>
 Łukasz Majewski <[email protected]>
+Lukasz Majewski <[email protected]>
+Mirza <[email protected]>