Update Nicolas Pitre's email address

The @Linaro version won't be valid much longer. Signed-off-by: Nicolas Pitre <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
simonjhall · Apr 3, 2019 · 9f3bd8f · 9f3bd8f
1 parent 5e7a8ca
commit 9f3bd8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/.mailmap b/.mailmap
@@ -156,6 +156,8 @@ Morten Welinder <[email protected]>
 Morten Welinder <[email protected]>
 Mythri P K <[email protected]>
 Nguyen Anh Quynh <[email protected]>
+Nicolas Pitre <[email protected]> <[email protected]>
+Nicolas Pitre <[email protected]> <[email protected]>
 Paolo 'Blaisorblade' Giarrusso <[email protected]>
 Patrick Mochel <[email protected]>
 Paul Burton <[email protected]> <[email protected]>

diff --git a/MAINTAINERS b/MAINTAINERS
@@ -4129,7 +4129,7 @@ F:	drivers/cpuidle/*
 F:	include/linux/cpuidle.h
 
 CRAMFS FILESYSTEM
-M:	Nicolas Pitre <nico@linaro.org>
+M:	Nicolas Pitre <nico@fluxnic.net>
 S:	Maintained
 F:	Documentation/filesystems/cramfs.txt
 F:	fs/cramfs/