From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 7 May 2015 16:24:32 +0000 (+0200)
Subject: Merge tag 'arm-soc/for-4.1/maintainers' of http://github.com/broadcom/stblinux into... 
X-Git-Tag: omap-for-v4.2/omap1-v2~10^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6ad446dd75ef58bd383987e35ffd90d564f8080;p=pandora-kernel.git

Merge tag 'arm-soc/for-4.1/maintainers' of github.com/broadcom/stblinux into fixes

Merge "MAINTAINERS update for Broadcom SoCs for 4.1 #2" from Florian Fainelli:

This pull request contains 3 changes to the MAINTAINERS file for Broadcom SoCs:

- add Ray and Scott for mach-bcm
- remove Christian for mach-bcm
- remove Marc for brcmstb

* tag 'arm-soc/for-4.1/maintainers' of http://github.com/broadcom/stblinux:
  MAINTAINERS: Update brcmstb entry
  MAINTAINERS: Remove Christian Daudt for mach-bcm
  MAINTAINERS: Update mach-bcm maintainers list
---

d6ad446dd75ef58bd383987e35ffd90d564f8080