mailmap: update Javier Martinez Canillas' email

Javier Martinez Canillas · torvalds · commit b8fa0efa0110 · 2015-10-23T17:55:10.000+09:00
The get_maintainer script still reports my old Collabora email based on
old commits but that address no longer exist so update mailmap to report
my current email and avoid people sending to the old address.

Signed-off-by: Javier Martinez Canillas &lt;javier@osg.samsung.com&gt;
Signed-off-by: Andrew Morton &lt;akpm@linux-foundation.org&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@linux-foundation.org&gt;
diff --git a/.mailmap b/.mailmap
@@ -59,6 +59,7 @@ James Bottomley <jejb@mulgrave.(none)>
 James Bottomley <jejb@titanic.il.steeleye.com>
 James E Wilson <wilson@specifix.com>
 James Ketrenos <jketreno@io.(none)>
+<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>
 Jean Tourrilhes <jt@hpl.hp.com>
 Jeff Garzik <jgarzik@pretzel.yyz.us>
 Jens Axboe <axboe@suse.de>

-Original file line number
+Diff line change
 James Bottomley <[email protected]>
 James E Wilson <[email protected]>
 James Ketrenos <jketreno@io.(none)>
 +<[email protected]> <[email protected]>
 Jean Tourrilhes <[email protected]>
 Jeff Garzik <[email protected]>
 Jens Axboe <[email protected]>