aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArnd Bergmann <[email protected]>2021-04-09 21:48:03 +0200
committerArnd Bergmann <[email protected]>2021-04-09 21:48:03 +0200
commitd92e5e32fb4fce7ae939ad322aad77955dd5dcda (patch)
tree00dddded0ac5be17357db9e1c54153a5265dd742
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
-rw-r--r--.mailmap2
-rw-r--r--MAINTAINERS2
2 files changed, 3 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 85b93cdefc87..f2c1a871835e 100644
--- a/.mailmap
+++ b/.mailmap
@@ -255,6 +255,8 @@ Nguyen Anh Quynh <[email protected]>
+Nicolas Saenz Julienne <[email protected]> <[email protected]>
+Nicolas Saenz Julienne <[email protected]> <[email protected]>
diff --git a/MAINTAINERS b/MAINTAINERS
index 54661f52c272..3c04d733a07a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3371,7 +3371,7 @@ F: include/linux/dsa/brcm.h
F: include/linux/platform_data/b53.h
BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE
-M: Nicolas Saenz Julienne <[email protected]>
+M: Nicolas Saenz Julienne <[email protected]>
L: [email protected] (moderated for non-subscribers)
L: [email protected] (moderated for non-subscribers)