summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-12-15 17:58:18 +0100
committerArnd Bergmann <arnd@arndb.de>2015-12-15 17:58:18 +0100
commit3b47a9fced45dd3b0dd3e540ad5ca88c4d1e5747 (patch)
treef1e3b2cf3703487e07b8c19b758e8b71fc77ef42 /MAINTAINERS
parent31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 (diff)
parent9c2abe2f7159a6013004b6189a9867e880085e96 (diff)
downloadlinux-3b47a9fced45dd3b0dd3e540ad5ca88c4d1e5747.tar.gz
linux-3b47a9fced45dd3b0dd3e540ad5ca88c4d1e5747.tar.bz2
linux-3b47a9fced45dd3b0dd3e540ad5ca88c4d1e5747.zip
Merge tag 'arm-soc/for-4.5/maintainers' of http://github.com/Broadcom/stblinux into next/fixes-non-critical
Merge "Broadcom devicetree changes for v4.5" from Florian Fainelli: This pull request contains MAINTAINERS updates for Broadcom SoCs: - Florian Fainelli adds bcm-kernel-feedback-list for all Broadcom Set-Top Box SoCs submissions and removes a stray '>' for the gpio-brcmstb section * tag 'arm-soc/for-4.5/maintainers' of http://github.com/Broadcom/stblinux: MAINTAINERS: gpio-brcmstb: Remove stray '>' MAINTAINERS: brcmstb: Include Broadcom internal mailing-list
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index cba790b42f23..59196e8c43fd 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2357,6 +2357,7 @@ M: Brian Norris <computersforpeace@gmail.com>
M: Gregory Fong <gregory.0xf0@gmail.com>
M: Florian Fainelli <f.fainelli@gmail.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*
@@ -2430,7 +2431,7 @@ N: bcm88312
BROADCOM BRCMSTB GPIO DRIVER
M: Gregory Fong <gregory.0xf0@gmail.com>
-L: bcm-kernel-feedback-list@broadcom.com>
+L: bcm-kernel-feedback-list@broadcom.com
S: Supported
F: drivers/gpio/gpio-brcmstb.c
F: Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.txt