aboutsummaryrefslogtreecommitdiffstats
path: root/.mailmap
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2021-04-09 21:48:03 +0200
committerArnd Bergmann <arnd@arndb.de>2021-04-09 21:48:03 +0200
commitd92e5e32fb4fce7ae939ad322aad77955dd5dcda (patch)
tree00dddded0ac5be17357db9e1c54153a5265dd742 /.mailmap
parentf72de385f8c38bc76269205d3a7d09d446829d02 (diff)
parent0072f6c37f02071821eb2135b80daa404d783704 (diff)
Merge tag 'arm-soc/for-5.13/maintainers' of https://github.com/Broadcom/stblinux into arm/soc
This pull request contains Broadcom SoC MAINTAINERS file entries and .mailmap updates for 5.13, please pull the following: - Nicolas updates his maintainer email to a kernel.org address for continuity * tag 'arm-soc/for-5.13/maintainers' of https://github.com/Broadcom/stblinux: mailmap: Update email address for Nicolas Saenz MAINTAINERS: Update BCM2711/BCM2335 maintainer's mail Link: https://lore.kernel.org/r/20210409175018.3051283-1-f.fainelli@gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 2 insertions, 0 deletions
diff --git a/.mailmap b/.mailmap
index 85b93cdefc87..f2c1a871835e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -255,6 +255,8 @@ Nguyen Anh Quynh <aquynh@gmail.com>
Nicolas Ferre <nicolas.ferre@microchip.com> <nicolas.ferre@atmel.com>
Nicolas Pitre <nico@fluxnic.net> <nicolas.pitre@linaro.org>
Nicolas Pitre <nico@fluxnic.net> <nico@linaro.org>
+Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.de>
+Nicolas Saenz Julienne <nsaenz@kernel.org> <nsaenzjulienne@suse.com>
Oleksij Rempel <linux@rempel-privat.de> <bug-track@fisher-privat.net>
Oleksij Rempel <linux@rempel-privat.de> <external.Oleksij.Rempel@de.bosch.com>
Oleksij Rempel <linux@rempel-privat.de> <fixed-term.Oleksij.Rempel@de.bosch.com>

Privacy Policy