diff options
| author | Olof Johansson <[email protected]> | 2019-10-23 20:01:24 -0700 |
|---|---|---|
| committer | Olof Johansson <[email protected]> | 2019-10-23 20:01:25 -0700 |
| commit | 116c05bfa17fbfeb158612139955bf55d1a2831e (patch) | |
| tree | a2313c2bd138fb8c1426c13badec067850a7070b | |
| parent | d4267a57d384334c4b4937cac292bfb150439fc8 (diff) | |
| parent | 0d660ffbca1a5f16f6db8f6ccbea5c207ec7e361 (diff) | |
Merge tag 'arm-soc/for-5.5/maintainers' of https://github.com/Broadcom/stblinux into arm/fixes
This pull request contains MAINTAINERS file updates for Broadcom SoCs
for the 5.5 kernel, please pull the following:
- Simon adds a .mailmap alias for his old email
- Stefan updates the existing BCM2835 with BCM2711 which is the chip
name for the Raspberry Pi 4
- Florian removes Gregory and Brian from the MAINTAINERS file for
BRCMSTB SoCs
* tag 'arm-soc/for-5.5/maintainers' of https://github.com/Broadcom/stblinux:
MAINTAINERS: Remove Gregory and Brian for ARCH_BRCMSTB
mailmap: Add Simon Arlott (replacement for expired email address)
MAINTAINERS: Add BCM2711 to BCM2835 ARCH
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Olof Johansson <[email protected]>
| -rw-r--r-- | .mailmap | 1 | ||||
| -rw-r--r-- | MAINTAINERS | 5 |
2 files changed, 3 insertions, 3 deletions
@@ -229,6 +229,7 @@ Shuah Khan <[email protected]> <[email protected]> Shuah Khan <[email protected]> <[email protected]> Shuah Khan <[email protected]> <[email protected]> Shuah Khan <[email protected]> <[email protected]> +Simon Arlott <[email protected]> <[email protected]> Simon Kelley <[email protected]> Stéphane Witzmann <[email protected]> Stephen Hemminger <[email protected]> diff --git a/MAINTAINERS b/MAINTAINERS index baac17ad16d6..94edb673dca5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3189,7 +3189,7 @@ N: bcm216* N: kona F: arch/arm/mach-bcm/ -BROADCOM BCM2835 ARM ARCHITECTURE +BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE M: Eric Anholt <[email protected]> M: Stefan Wahren <[email protected]> @@ -3197,6 +3197,7 @@ L: [email protected] (moderated for non-subscribers) L: [email protected] (moderated for non-subscribers) T: git git://github.com/anholt/linux S: Maintained +N: bcm2711 N: bcm2835 F: drivers/staging/vc04_services @@ -3243,8 +3244,6 @@ S: Maintained F: drivers/usb/gadget/udc/bcm63xx_udc.* BROADCOM BCM7XXX ARM ARCHITECTURE -M: Brian Norris <[email protected]> -M: Gregory Fong <[email protected]> M: Florian Fainelli <[email protected]> L: [email protected] (moderated for non-subscribers) |