diff options
| author | Nicolas Pitre <nico@fluxnic.net> | 2019-04-02 19:18:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-04-03 06:12:44 +0200 |
| commit | 9f3bd8fe8f9d39e27e29c7134b21e335d1c7db6c (patch) | |
| tree | efa6c4b9b12a710b5cdbc41f1d5d7a02d8cfc899 | |
| parent | Merge branch 'work.aio' of git://git.kernel.org/pub/scm/linux/kernel/git/viro... (diff) | |
| download | linux-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>
| -rw-r--r-- | .mailmap | 2 | ||||
| -rw-r--r-- | MAINTAINERS | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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> diff --git a/MAINTAINERS b/MAINTAINERS index 43b36dbed48e..391405091c6b 100644 --- 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/ |