-
Arnd Bergmann authored
Merge tag 'arm-soc/for-4.12/maintainers' of http://github.com/Broadcom/stblinux into next/fixes-non-critical Pull "Broadcom maintainers changes for 4.12" from Florian Fainelli: This pull request contains Broadcom ARM-based SoCs MAINTAINERS file updates for 4.12, please pull the following: - Jon adds himself as a maintainer for the BCM5301X SoCs (Northstar) since he has been contributing changes to these platforms for a while now - Stephen Warren removes himself from the BCM2835 maintainers (Rasperrby Pi) since in his own words he has not been active that much lately - Eric adds Stefan Wahren as a maintainer for the BCM2835 platform since he has been very active on it for neary 2 years now * tag 'arm-soc/for-4.12/maintainers' of http://github.com/Broadcom/stblinux: MAINTAINERS: Add Stefan Wahren to bcm2835. MAINTAINERS: remove swarren from bcm2835 MAINTAINERS: Add Jon Mason to BCM5301X maintainers
6b62a007