]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge tag 'bcm2835-maintainers-next-2017-03-21' into maintainers/next
authorFlorian Fainelli <f.fainelli@gmail.com>
Fri, 24 Mar 2017 17:14:50 +0000 (10:14 -0700)
committerFlorian Fainelli <f.fainelli@gmail.com>
Fri, 24 Mar 2017 17:14:50 +0000 (10:14 -0700)
This pull request updates the MAINTAINERS file for BCM283x for 4.12.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
1  2 
MAINTAINERS

diff --combined MAINTAINERS
index e402c4a5bbb3e3294cb23b1d9ac902a9c5e46682,ec4e500d6aa6f13be80d160fe0c26057e47a00ba..cff8ddb7e2c1ce430cb99f9a26a4c5fe9132bf2b
@@@ -2649,9 -2649,9 +2649,9 @@@ N:      kon
  F:    arch/arm/mach-bcm/
  
  BROADCOM BCM2835 ARM ARCHITECTURE
- M:    Stephen Warren <swarren@wwwdotorg.org>
  M:    Lee Jones <lee@kernel.org>
  M:    Eric Anholt <eric@anholt.net>
+ M:    Stefan Wahren <stefan.wahren@i2se.com>
  L:    linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://github.com/anholt/linux
@@@ -2671,14 -2671,12 +2671,14 @@@ 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:    Jon Mason <jonmason@broadcom.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/bcm470*
 +F:    arch/arm/boot/dts/bcm953012*
  
  BROADCOM BCM53573 ARM ARCHITECTURE
  M:    Rafał Miłecki <rafal@milecki.pl>