Merge tag 'for-linus-20171120' of git://git.infradead.org/linux-mtd

[sfrench/cifs-2.6.git] / .mailmap

diff --git a/.mailmap b/.mailmap
index c021f29779a7a1cce57d5c6aa36ee271a745e47a..1469ff0d3f4d55dde07c676e4c4fc29f432d20f3 100644 (file)
--- a/.mailmap
+++ b/.mailmap
@@ -73,6 +73,8 @@ James E Wilson <wilson@specifix.com>
 James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>
 James Hogan <jhogan@kernel.org> <james@albanarts.com>
 James Ketrenos <jketreno@io.(none)>
+Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>
+Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>
 Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>
 <javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
 Jean Tourrilhes <jt@hpl.hp.com>