diff --git a/.mailmap b/.mailmap index 23241db2647f7d007ffc880869d8bf8b45f75294..984ddd1f6ad3616cc3b54248dcbf6cad1c550a61 100644 --- a/.mailmap +++ b/.mailmap @@ -98,8 +98,7 @@ Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com> Christian Marangi <ansuelsmth@gmail.com> 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> +Colin Ian King <colin.i.king@gmail.com> <colin.king@canonical.com> Corey Minyard <minyard@acm.org> Damian Hobson-Garcia <dhobsong@igel.co.jp> Daniel Borkmann <daniel@iogearbox.net> <danborkmann@googlemail.com>