diff options
author | Arnd Bergmann <[email protected]> | 2016-07-07 15:52:24 +0200 |
---|---|---|
committer | Arnd Bergmann <[email protected]> | 2016-07-07 16:09:27 +0200 |
commit | 2e2843f1b7a3c88761596fc5b2ef21b85c05ef55 (patch) | |
tree | 67029b8d1d0779621ab43f24bff670992073b92b | |
parent | 147de9757d49768b1163bcb02eb86039628ab47f (diff) | |
parent | ccf62f5ab83f47796b87b4d3dff6fd33a6b02bb4 (diff) |
Merge tag 'arm-soc/for-4.8/maintainers-part2' of http://github.com/Broadcom/stblinux into next/soc
This pull request contains MAINTAINERS file changes for Broadcom entries:
- Rafal updates the BCM5301x entry to include the internal Broadcom
mailing-list so it's easy for engineers there to keep track of patches
- Jon updates the NSP regexp, updates the NS2, BCM63xx and Broadcom Mobile SoCs
entry
- Florian changes L to M in all Broadcom ARM/ARM64 entries per feeedback
* tag 'arm-soc/for-4.8/maintainers-part2' of http://github.com/Broadcom/stblinux:
MAINTAINERS: Update BCM281XX/BCM11XXX/BCM216XX entry
MAINTAINERS: Update BCM63XX entry
MAINTAINERS: Add NS2 entry
MAINTAINERS: Fix nsp false-positives
MAINTAINERS: Change L to M for Broadcom ARM/ARM64 SoC entries
MAINTAINERS: Update entry for BCM5301X ARM
-rw-r--r-- | MAINTAINERS | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 362a93cb315a..8da2d7157c06 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2479,17 +2479,14 @@ BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE M: Florian Fainelli <[email protected]> M: Ray Jui <[email protected]> M: Scott Branden <[email protected]> T: git git://github.com/broadcom/mach-bcm S: Maintained +N: bcm281* +N: bcm113* +N: bcm216* +N: kona F: arch/arm/mach-bcm/ -F: arch/arm/boot/dts/bcm113* -F: arch/arm/boot/dts/bcm216* -F: arch/arm/boot/dts/bcm281* -F: arch/arm64/boot/dts/broadcom/ -F: arch/arm/configs/bcm_defconfig -F: drivers/mmc/host/sdhci-bcm-kona.c -F: drivers/clocksource/bcm_kona_timer.c BROADCOM BCM2835 ARM ARCHITECTURE M: Stephen Warren <[email protected]> @@ -2512,20 +2509,21 @@ F: arch/mips/include/asm/mach-bcm47xx/* BROADCOM BCM5301X ARM ARCHITECTURE M: Hauke Mehrtens <[email protected]> +M: Rafał Miłecki <[email protected]> S: Maintained F: arch/arm/mach-bcm/bcm_5301x.c -F: arch/arm/boot/dts/bcm5301x.dtsi +F: arch/arm/boot/dts/bcm5301x*.dtsi F: arch/arm/boot/dts/bcm470* BROADCOM BCM63XX ARM ARCHITECTURE M: Florian Fainelli <[email protected]> L: [email protected] (moderated for non-subscribers) T: git git://github.com/broadcom/stblinux.git S: Maintained -F: arch/arm/mach-bcm/bcm63xx.c -F: arch/arm/include/debug/bcm63xx.S +N: bcm63xx BROADCOM BCM63XX/BCM33XX UDC DRIVER M: Kevin Cernekee <[email protected]> @@ -2537,8 +2535,8 @@ 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) T: git git://github.com/broadcom/stblinux.git S: Maintained F: arch/arm/mach-bcm/*brcmstb* @@ -2596,13 +2594,13 @@ BROADCOM IPROC ARM ARCHITECTURE M: Ray Jui <[email protected]> M: Scott Branden <[email protected]> M: Jon Mason <[email protected]> L: [email protected] (moderated for non-subscribers) T: git git://github.com/broadcom/cygnus-linux.git S: Maintained N: iproc N: cygnus -N: nsp +N: bcm[-_]nsp N: bcm9113* N: bcm9583* N: bcm9585* @@ -2613,6 +2611,9 @@ N: bcm583* N: bcm585* N: bcm586* N: bcm88312 +F: arch/arm64/boot/dts/broadcom/ns2* +F: drivers/clk/bcm/clk-ns* +F: drivers/pinctrl/bcm/pinctrl-ns* BROADCOM BRCMSTB GPIO DRIVER M: Gregory Fong <[email protected]> @@ -2657,8 +2658,8 @@ F: drivers/net/ethernet/broadcom/bcmsysport.* BROADCOM VULCAN ARM64 SOC M: Jayachandran C. <[email protected]> L: [email protected] (moderated for non-subscribers) S: Maintained F: arch/arm64/boot/dts/broadcom/vulcan* |