diff options
| author | Olof Johansson <[email protected]> | 2020-09-13 11:37:46 -0700 |
|---|---|---|
| committer | Olof Johansson <[email protected]> | 2020-09-13 11:37:47 -0700 |
| commit | 0a29f7e408ab73354f6fc378f3a0e6b2a4ba3aad (patch) | |
| tree | 20e7c25cd66e3905a63ef47071f16ef336e60ad1 | |
| parent | 989286ffe8320164c7ec70bd16481ac2256d58b7 (diff) | |
| parent | 487047b87a6c3b49ce9d694ae765633dd43225a8 (diff) | |
Merge tag 'arm-soc/for-5.10/maintainers' of https://github.com/Broadcom/stblinux into arm/soc
This pull request contains Broadcom SoCs changes to the MAINTAINERS file
for 5.10, please pull the following:
- Christian updates the BCM5301x (Northstar) section to cover additional
files added for the Cisco Meraki MR32
* tag 'arm-soc/for-5.10/maintainers' of https://github.com/Broadcom/stblinux:
MAINTAINERS: extend BCM5301X ARM ARCHITECTURE files
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Olof Johansson <[email protected]>
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 540ff4d5a3ad..1af13ebac876 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3435,7 +3435,7 @@ M: [email protected] S: Maintained F: arch/arm/boot/dts/bcm470* -F: arch/arm/boot/dts/bcm5301x*.dtsi +F: arch/arm/boot/dts/bcm5301* F: arch/arm/boot/dts/bcm953012* F: arch/arm/mach-bcm/bcm_5301x.c |