summaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorNicolas Pitre <nico@fluxnic.net>2019-04-02 19:18:45 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2019-04-03 06:12:44 +0200
commit9f3bd8fe8f9d39e27e29c7134b21e335d1c7db6c (patch)
treeefa6c4b9b12a710b5cdbc41f1d5d7a02d8cfc899 /.mailmap
parentMerge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro... (diff)
downloadlinux-9f3bd8fe8f9d39e27e29c7134b21e335d1c7db6c.tar.xz
linux-9f3bd8fe8f9d39e27e29c7134b21e335d1c7db6c.zip
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>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index b2cde8668dcc..ae2bcad06f4b 100644
--- a/.mailmap
+++ b/.mailmap
@@ -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>