summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorColin Ian King <colin.i.king@googlemail.com>2021-11-09 05:32:49 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2021-11-09 21:02:49 +0300
commit7d60ac00979297d2d303a590891b6d282667c389 (patch)
tree7b279b3f6421ff208a3e415745472bacb70f2130 /.mailmap
parente1edc277e6f6dfb372216522dfc57f9381c39e35 (diff)
downloadlinux-7d60ac00979297d2d303a590891b6d282667c389.tar.xz
mailmap: update email address for Colin King
Colin King has moved to Intel to update gmail and Canonical email addresses. Link: https://lkml.kernel.org/r/20211102231617.78569-1-colin.i.king@gmail.com Signed-off-by: Colin Ian King <colin.i.king@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 90e614d2bf7e..bccab013ee1c 100644
--- a/.mailmap
+++ b/.mailmap
@@ -73,6 +73,8 @@ Chris Chiu <chris.chiu@canonical.com> <chiu@endlessm.com>
Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org>
Christophe Ricard <christophe.ricard@gmail.com>
Christoph Hellwig <hch@lst.de>
+Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
+Colin Ian King <colin.king@intel.com> <colin.i.king@gmail.com>
Corey Minyard <minyard@acm.org>
Damian Hobson-Garcia <dhobsong@igel.co.jp>
Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>