summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorSimon Arlott <simon@octiron.net>2019-08-22 20:01:56 +0100
committerStefan Wahren <wahrenst@gmx.net>2019-10-12 12:48:25 +0200
commita91f757bda1a48317f692487addf832ebf8e93aa (patch)
treedf09fb664f10175956aacec2cf71757d3d97dcd6 /.mailmap
parentf1e5aa6c13feb8ee47ff5d116bed0a10007686f1 (diff)
downloadlinux-a91f757bda1a48317f692487addf832ebf8e93aa.tar.bz2
mailmap: Add Simon Arlott (replacement for expired email address)
Add replacement email address for the one on my expired domain. Signed-off-by: Simon Arlott <simon@octiron.net> Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap1
1 files changed, 1 insertions, 0 deletions
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>