The @linaro version won't be valid much longer. Signed-off-by: Nicolas Pitre <n...@fluxnic.net>
diff --git a/.mailmap b/.mailmap index b2cde8668d..ae2bcad06f 100644 --- a/.mailmap +++ b/.mailmap @@ -156,6 +156,8 @@ Morten Welinder <welin...@darter.rentec.com> Morten Welinder <welin...@troll.com> Mythri P K <mythr...@ti.com> Nguyen Anh Quynh <aqu...@gmail.com> +Nicolas Pitre <n...@fluxnic.net> <nicolas.pi...@linaro.org> +Nicolas Pitre <n...@fluxnic.net> <n...@linaro.org> Paolo 'Blaisorblade' Giarrusso <blaisorbl...@yahoo.it> Patrick Mochel <moc...@digitalimplant.org> Paul Burton <paul.bur...@mips.com> <paul.bur...@imgtec.com> 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 <n...@linaro.org> +M: Nicolas Pitre <n...@fluxnic.net> S: Maintained F: Documentation/filesystems/cramfs.txt F: fs/cramfs/
