Commit 3b47a9fc authored Dec 15, 2015 by Arnd Bergmann

stblinux...

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

parents 31ade3b8 9c2abe2f

MAINTAINERS

+2 −1

Original line number	Diff line number	Diff line
		@@ -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

Admin message