Commit c442c8bd authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'arm-soc/for-4.8/maintainers-part2' of... 

Merge tag 'arm-soc/for-4.8/maintainers-part2' of http://github.com/Broadcom/stblinux into next/drivers

This avoids a merge conflict between the soc branch containing the maintainer
updates, and the update for the kona reset driver.

* 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

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 9bb45cd4 ccf62f5a

MAINTAINERS

+17 −17
Original line number Diff line number Diff line
@@ -2479,18 +2479,14 @@ BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITECTURE 
M:	Florian Fainelli <f.fainelli@gmail.com>

M:	Ray Jui <rjui@broadcom.com>

M:	Scott Branden <sbranden@broadcom.com>

L:	bcm-kernel-feedback-list@broadcom.com

M:	bcm-kernel-feedback-list@broadcom.com

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

F:	drivers/power/reset/brcm-kona-reset.c



BROADCOM BCM2835 ARM ARCHITECTURE

M:	Stephen Warren <swarren@wwwdotorg.org>
@@ -2513,20 +2509,21 @@ F: arch/mips/include/asm/mach-bcm47xx/* 


BROADCOM BCM5301X ARM ARCHITECTURE

M:	Hauke Mehrtens <hauke@hauke-m.de>

M:	Rafał Miłecki <zajec5@gmail.com>

M:	bcm-kernel-feedback-list@broadcom.com

L:	linux-arm-kernel@lists.infradead.org

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 <f.fainelli@gmail.com>

M:	bcm-kernel-feedback-list@broadcom.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	bcm-kernel-feedback-list@broadcom.com

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 <cernekee@gmail.com>
@@ -2538,8 +2535,8 @@ BROADCOM BCM7XXX ARM ARCHITECTURE 
M:	Brian Norris <computersforpeace@gmail.com>

M:	Gregory Fong <gregory.0xf0@gmail.com>

M:	Florian Fainelli <f.fainelli@gmail.com>

M:	bcm-kernel-feedback-list@broadcom.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	bcm-kernel-feedback-list@broadcom.com

T:	git git://github.com/broadcom/stblinux.git

S:	Maintained

F:	arch/arm/mach-bcm/*brcmstb*
@@ -2597,13 +2594,13 @@ BROADCOM IPROC ARM ARCHITECTURE 
M:	Ray Jui <rjui@broadcom.com>

M:	Scott Branden <sbranden@broadcom.com>

M:	Jon Mason <jonmason@broadcom.com>

M:	bcm-kernel-feedback-list@broadcom.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	bcm-kernel-feedback-list@broadcom.com

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*
@@ -2614,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 <gregory.0xf0@gmail.com>
@@ -2658,8 +2658,8 @@ F: drivers/net/ethernet/broadcom/bcmsysport.* 


BROADCOM VULCAN ARM64 SOC

M:	Jayachandran C. <jchandra@broadcom.com>

M:	bcm-kernel-feedback-list@broadcom.com

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

L:	bcm-kernel-feedback-list@broadcom.com

S:	Maintained

F:	arch/arm64/boot/dts/broadcom/vulcan*

CRA Git | Maintained and supported by SUSTech CRA and CCSE