aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 86d0760c15eb9..6686879ce0d5d 100644
--- a/.mailmap
+++ b/.mailmap
@@ -299,6 +299,8 @@ Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>
Mathieu Othacehe <m.othacehe@gmail.com>
+Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>
+Mat Martineau <martineau@kernel.org> <mathewm@codeaurora.org>
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>