The @linaro version won't be valid much longer. Signed-off-by: Nicolas Pitre <[email protected]>
diff --git a/.mailmap b/.mailmap index b2cde8668d..ae2bcad06f 100644 --- 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 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 <[email protected]> +M: Nicolas Pitre <[email protected]> S: Maintained F: Documentation/filesystems/cramfs.txt F: fs/cramfs/
