[PATCH] update my email address

[Nicolas Pitre]

The @linaro version won't be valid much longer.

Signed-off-by: Nicolas Pitre <nico@xxxxxxxxxxx>

diff --git a/.mailmap b/.mailmap
index b2cde8668d..ae2bcad06f 100644
--- a/.mailmap
+++ b/.mailmap
@@ -156,6 +156,8 @@ Morten Welinder <welinder@xxxxxxxxxxxxxxxxx>
 Morten Welinder <welinder@xxxxxxxxx>
 Mythri P K <mythripk@xxxxxx>
 Nguyen Anh Quynh <aquynh@xxxxxxxxx>
+Nicolas Pitre <nico@xxxxxxxxxxx> <nicolas.pitre@xxxxxxxxxx>
+Nicolas Pitre <nico@xxxxxxxxxxx> <nico@xxxxxxxxxx>
 Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
 Patrick Mochel <mochel@xxxxxxxxxxxxxxxxxx>
 Paul Burton <paul.burton@xxxxxxxx> <paul.burton@xxxxxxxxxx>
diff --git a/MAINTAINERS b/MAINTAINERS
index 43b36dbed4..391405091c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4129,7 +4129,7 @@ F:	drivers/cpuidle/*
 F:	include/linux/cpuidle.h
 
 CRAMFS FILESYSTEM
-M:	Nicolas Pitre <nico@xxxxxxxxxx>
+M:	Nicolas Pitre <nico@xxxxxxxxxxx>
 S:	Maintained
 F:	Documentation/filesystems/cramfs.txt
 F:	fs/cramfs/