X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=.mailmap;h=f652f3725772cd5849f037bbb6e7ec9a5fe4e3fd;hb=86ec2e1739aa1d6565888b4b2059fa47354e1a89;hp=edcac87e76c8c7fe9020943bdce012f7e47dc962;hpb=f1f2f614d535564992f32e720739cb53cf03489f;p=linux.git

diff --git a/.mailmap b/.mailmap
index edcac87e76c8..f652f3725772 100644
--- a/.mailmap
+++ b/.mailmap
@@ -229,6 +229,7 @@ Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
 Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
 Shuah Khan <shuah@kernel.org> <shuahkh@osg.samsung.com>
 Shuah Khan <shuah@kernel.org> <shuah.kh@samsung.com>
+Simon Arlott <simon@octiron.net> <simon@fire.lp0.eu>
 Simon Kelley <simon@thekelleys.org.uk>
 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
 Stephen Hemminger <shemminger@osdl.org>