.mailmap: Run mailmapper and sync name locations

The patch is output from
scripts/mailmapper > tmp; mv tmp .mailmap
with moving <[email protected]> and <[email protected]> to the same
block with "This contributor prefers not to receive mails" description.

Signed-off-by: Michal Simek <[email protected]>

1 files changed, 14 insertions, 14 deletions

diff --git a/.mailmap b/.mailmap
index 7c4b64336d2..76ba0a7fea3 100644
--- a/.mailmap
+++ b/.mailmap
@@ -15,6 +15,7 @@
 # Proper Name <[email protected]> <[email protected]>
 # Proper Name <[email protected]> Commit Name <[email protected]>
 
+<[email protected]> <[email protected]>
 AKASHI Takahiro <[email protected]> <[email protected]>
 Abbarapu Venkatesh Yadav <[email protected]> Venkatesh Yadav Abbarapu <[email protected]>
 Alexander Graf <[email protected]> <[email protected]>
@@ -42,22 +43,21 @@ Chen-Yu Tsai <[email protected]> <[email protected]>
 Christian Kohn <[email protected]> <[email protected]>
 Christopher Obbard <[email protected]> <[email protected]>
 Dirk Behme <[email protected]>
-<[email protected]> <[email protected]>
 Durga Challa <[email protected]> <[email protected]>
-Eugen Hristev <[email protected]> <[email protected]>
-Eugen Hristev <[email protected]> <[email protected]>
 Eugen Hristev <[email protected]> <[email protected]>
+Eugen Hristev <[email protected]> <[email protected]>
+Eugen Hristev <[email protected]> <[email protected]>
 Fabio Estevam <[email protected]>
 Greg Malysa <[email protected]> <[email protected]>
 Gregory CLEMENT <[email protected]> <[email protected]>
 Harini Katakam <[email protected]> <[email protected]>
 Harsha <[email protected]> <[email protected]>
-Heiko Stuebner <[email protected]> <[email protected]>
-Heiko Schocher <[email protected]> <[email protected]>
-Heiko Schocher <[email protected]> <[email protected]>
-Heiko Schocher <[email protected]> <[email protected]>
 Heiko Schocher <[email protected]> <[[email protected]]>
+Heiko Schocher <[email protected]> <[email protected]>
+Heiko Schocher <[email protected]> <[email protected]>
 Heiko Schocher <[email protected]> <hs@pollux.(none)>
+Heiko Schocher <[email protected]> <[email protected]>
+Heiko Stuebner <[email protected]> <[email protected]>
 Heinrich Schuchardt <[email protected]> <[email protected]>
 Heinrich Schuchardt <[email protected]> [email protected] <[email protected]>
 Ibai Erkiaga <[email protected]> <[email protected]>
@@ -73,14 +73,13 @@ Jakob Unterwurzacher <[email protected]> <jakob.unterwurzacher@theo
 Javier Tia <[email protected]> <[email protected]>
 Jay Buddhabhatti <[email protected]> <[email protected]>
 Jernej Skrabec <[email protected]> <[email protected]>
-Jerome Forissier <[email protected]> <[email protected]>
 Jerome Forissier <[email protected]> <[email protected]>
+Jerome Forissier <[email protected]> <[email protected]>
 John Linn <[email protected]> <[email protected]>
 Jyotheeswar Reddy Mutthareddyvari <[email protected]> <[email protected]>
 Jyotheeswar Reddy Mutthareddyvari <[email protected]> <[email protected]>
 Kalyani Akula <[email protected]> <[email protected]>
 Klaus Goger <[email protected]> <[email protected]>
-Masahisa Kojima <[email protected]> <[email protected]>
 Linus Walleij <[email protected]> <[email protected]>
 Love Kumar <[email protected]> <[email protected]>
 Lukasz Majewski <[email protected]>
@@ -90,8 +89,9 @@ Marek Vasut <[email protected]> <[email protected]>
 Marek Vasut <[email protected]> <[email protected]>
 Marek Vasut <[email protected]> <marex at denx.de>
 Markus Klotzbuecher <[email protected]>
-Masahiro Yamada <[email protected]> <[email protected]>
 Masahiro Yamada <[email protected]> <[email protected]>
+Masahiro Yamada <[email protected]> <[email protected]>
+Masahisa Kojima <[email protected]> <[email protected]>
 Mattijs Korpershoek <[email protected]> <[email protected]>
 Michal Simek <[email protected]> <[email protected]>
 Michal Simek <[email protected]> <[email protected]>
@@ -107,8 +107,6 @@ Nava kishore Manne <[email protected]> <[email protected]>
 Neal Frager <[email protected]> <[email protected]>
 Neil Armstrong <[email protected]> <[email protected]>
 Nicolas Saenz Julienne <[email protected]> <[email protected]>
-This contributor prefers not to receive mails <[email protected]> <[email protected]>
-This contributor prefers not to receive mails <[email protected]> <[email protected]>
 Padmarao Begari <[email protected]> <[email protected]>
 Patrice Chotard <[email protected]> <[email protected]>
 Patrick Delaunay <[email protected]> <[email protected]>
@@ -149,9 +147,11 @@ Stefan Roese <[email protected]> <stroese>
 Stefano Babic <[email protected]>
 Stefano Stabellini <[email protected]> <[email protected]>
 Sughosh Ganu <[email protected]> <[email protected]>
-No generic patch CC mail please <[email protected]> <[email protected]>
-No generic patch CC mail please <[email protected]> <[email protected]>
 Sumit Garg <[email protected]> <[email protected]>
+This contributor prefers not to receive mails <[email protected]> <[email protected]>
+This contributor prefers not to receive mails <[email protected]> <[email protected]>
+This contributor prefers not to receive mails <[email protected]> <[email protected]>
+This contributor prefers not to receive mails <[email protected]> <[email protected]>
 Thomas Petazzoni <[email protected]> <[email protected]>
 Tom Rini <[email protected]> <[email protected]>
 Tomas Thoresen <[email protected]> <[email protected]>