summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorMatthew Wilcox2018-06-16 23:32:07 +0200
committerMatthew Wilcox2018-09-30 04:47:48 +0200
commit3d0186bb068e6cc6c23dc1d2f0b1cf64894c40ea (patch)
tree46d864fb986c06a511f3a95362710ba3d1200add /.mailmap
parentMerge tag 'for-linus-20180929' of git://git.kernel.dk/linux-block (diff)
downloadkernel-qcow2-linux-3d0186bb068e6cc6c23dc1d2f0b1cf64894c40ea.tar.gz
kernel-qcow2-linux-3d0186bb068e6cc6c23dc1d2f0b1cf64894c40ea.tar.xz
kernel-qcow2-linux-3d0186bb068e6cc6c23dc1d2f0b1cf64894c40ea.zip
Update email address
Redirect some older email addresses that are in the git logs. Signed-off-by: Matthew Wilcox <willy@infradead.org>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap7
1 files changed, 7 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 285e09645b31..89f532caf639 100644
--- a/.mailmap
+++ b/.mailmap
@@ -119,6 +119,13 @@ Mark Brown <broonie@sirena.org.uk>
Mark Yao <markyao0591@gmail.com> <mark.yao@rock-chips.com>
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
+Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
+Matthew Wilcox <willy@infradead.org> <matthew@wil.cx>
+Matthew Wilcox <willy@infradead.org> <mawilcox@linuxonhyperv.com>
+Matthew Wilcox <willy@infradead.org> <mawilcox@microsoft.com>
+Matthew Wilcox <willy@infradead.org> <willy@debian.org>
+Matthew Wilcox <willy@infradead.org> <willy@linux.intel.com>
+Matthew Wilcox <willy@infradead.org> <willy@parisc-linux.org>
Matthieu CASTET <castet.matthieu@free.fr>
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@brturbo.com.br>
Mauro Carvalho Chehab <mchehab@kernel.org> <maurochehab@gmail.com>