Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f3bd8fe authored Apr 02, 2019 by Nicolas Pitre Committed by Linus Torvalds Apr 02, 2019

Update Nicolas Pitre's email address



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

Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 5e7a8ca3

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -156,6 +156,8 @@ Morten Welinder <welinder@darter.rentec.com>
		Morten Welinder <welinder@troll.com>
		Mythri P K <mythripk@ti.com>
		Nguyen Anh Quynh <aquynh@gmail.com>
		Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
		Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
		Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
		Patrick Mochel <mochel@digitalimplant.org>
		Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>

MAINTAINERS

+1 −1

Original line number	Diff line number	Diff line
		@@ -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/