summaryrefslogtreecommitdiffstatshomepage
path: root/.mailmap
diff options
context:
space:
mode:
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap7
1 files changed, 4 insertions, 3 deletions
diff --git a/.mailmap b/.mailmap
index dc42cfb41304..9795e6bafe9b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -34,9 +34,9 @@ Axel Lin <axel.lin@gmail.com>
34Ben Gardner <bgardner@wabtec.com> 34Ben Gardner <bgardner@wabtec.com>
35Ben M Cahill <ben.m.cahill@intel.com> 35Ben M Cahill <ben.m.cahill@intel.com>
36Björn Steinbrink <B.Steinbrink@gmx.de> 36Björn Steinbrink <B.Steinbrink@gmx.de>
37Boris Brezillon <boris.brezillon@free-electrons.com> 37Boris Brezillon <boris.brezillon@bootlin.com> <boris.brezillon@free-electrons.com>
38Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon.dev@gmail.com> 38Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon.dev@gmail.com>
39Boris Brezillon <boris.brezillon@free-electrons.com> <b.brezillon@overkiz.com> 39Boris Brezillon <boris.brezillon@bootlin.com> <b.brezillon@overkiz.com>
40Brian Avery <b.avery@hp.com> 40Brian Avery <b.avery@hp.com>
41Brian King <brking@us.ibm.com> 41Brian King <brking@us.ibm.com>
42Christoph Hellwig <hch@lst.de> 42Christoph Hellwig <hch@lst.de>
@@ -128,6 +128,7 @@ Mayuresh Janorkar <mayur@ti.com>
128Michael Buesch <m@bues.ch> 128Michael Buesch <m@bues.ch>
129Michel Dänzer <michel@tungstengraphics.com> 129Michel Dänzer <michel@tungstengraphics.com>
130Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com> 130Miodrag Dinic <miodrag.dinic@mips.com> <miodrag.dinic@imgtec.com>
131Miquel Raynal <miquel.raynal@bootlin.com> <miquel.raynal@free-electrons.com>
131Mitesh shah <mshah@teja.com> 132Mitesh shah <mshah@teja.com>
132Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com> 133Mohit Kumar <mohit.kumar@st.com> <mohit.kumar.dhaka@gmail.com>
133Morten Welinder <terra@gnome.org> 134Morten Welinder <terra@gnome.org>