From: Olof Johansson Date: Thu, 24 Oct 2019 03:01:24 +0000 (-0700) Subject: Merge tag 'arm-soc/for-5.5/maintainers' of https://github.com/Broadcom/stblinux into... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=116c05bfa17fbfeb158612139955bf55d1a2831e;p=linux.git 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/20191023212814.30622-3-f.fainelli@gmail.com Signed-off-by: Olof Johansson --- 116c05bfa17fbfeb158612139955bf55d1a2831e