aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.mailmap1
-rw-r--r--AUTHORS1
2 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 8abc53432f..16ef6e7942 100644
--- a/.mailmap
+++ b/.mailmap
@@ -1,4 +1,5 @@
Adrian Simionov <daniel.simionov@gmail.com> <daniel.simionov@gmail.com>
+Ahmad Fatoum <ahmad@a3f.at> Ahmad Fatoum <ahmad.fatoum@siemens.com>
Alan Partis <alpartis@thundernet.com> alpartis <alpartis@thundernet.com>
Alexander Gärtner <sphinxs1988@googlemail.com> alage <sphinxs1988@googlemail.com>
Alexander Wetzel <alexander.wetzel@web.de> deagol
diff --git a/AUTHORS b/AUTHORS
index 5deaf07174..978bb20a00 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -3968,7 +3968,6 @@ Aditya Jain <aditya.jain[AT]samsung.com>
Adrian Simionov <daniel.simionov[AT]gmail.com>
Adrian-Ken Rueegsegger <ken[AT]codelabs.ch>
Adrien Aubry <adraub[AT]gmail.com>
-Ahmad Fatoum <ahmad.fatoum[AT]siemens.com>
Ahmad Fatoum <ahmad[AT]a3f.at>
Alan Partis <alpartis[AT]thundernet.com>
Alex Badea <abadea[AT]ixiacom.com>