aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson2015-08-11 15:13:03 +0200
committerOlof Johansson2015-08-11 15:13:03 +0200
commitefd16bda273a9be4f41343482c7c83e40f1cb4c8 (patch)
tree7c40d59576b584a6e8f33540571500211d3d7645
parent7776f8e3f8708787d0d70aa08dedba714b2b54af (diff)
parent824811293538f5cafaa6d19e3458a13eafa92a32 (diff)
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: Olof Johansson <olof@lixom.net>
-rw-r--r--MAINTAINERS2
1 files changed, 2 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index fd6078443083..edb8a078cb1b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2217,7 +2217,9 @@ F: drivers/clocksource/bcm_kona_timer.c
BROADCOM BCM2835 ARM ARCHITECTURE
M: Stephen Warren <swarren@wwwdotorg.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-arm-kernel@lists.infradead.org (moderated for non-subscribers)
T: git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git
S: Maintained
N: bcm2835