Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efd16bda authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'arm-soc/for-4.3/maintainers' of http://github.com/broadcom/stblinux...

Merge tag 'arm-soc/for-4.3/maintainers' of http://github.com/broadcom/stblinux into next/fixes-non-critical

This pull request contains the following changes to the MAINTAINERS file:

- Add Eric Anholt as a 3rd maintainer for the Raspberry Pi platform code/drivers
- Add linux-arm-kernel for all bcm2835 related drivers

* tag 'arm-soc/for-4.3/maintainers' of http://github.com/broadcom/stblinux

:
  MAINTAINERS: Explicitly add linux-arm-kernel for bcm2835
  MAINTAINERS: Add myself as a bcm2835 co-maintainer.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7776f8e3 82481129
Loading
Loading
Loading
Loading
+2 −0
Original line number Original line Diff line number Diff line
@@ -2217,7 +2217,9 @@ F: drivers/clocksource/bcm_kona_timer.c
BROADCOM BCM2835 ARM ARCHITECTURE
BROADCOM BCM2835 ARM ARCHITECTURE
M:	Stephen Warren <swarren@wwwdotorg.org>
M:	Stephen Warren <swarren@wwwdotorg.org>
M:	Lee Jones <lee@kernel.org>
M:	Lee Jones <lee@kernel.org>
M:	Eric Anholt <eric@anholt.net>
L:	linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
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://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git
S:	Maintained
S:	Maintained
N:	bcm2835
N:	bcm2835