summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2018-11-13 11:30:15 -0800
committerOlof Johansson <olof@lixom.net>2018-11-13 11:30:15 -0800
commitc644888099a9bb801b48542e7779d60a26e6d9cc (patch)
tree867460d5310d82ffcb0458c16988c01a93f04a3a /MAINTAINERS
parentc4bc2b7e7b19b8b4521c23b8c3b2e6931d9ec3aa (diff)
parent63415a3c38ddd952608a0bc9afd856f5fcdb6edb (diff)
Merge branch 'fixes' into for-next
* fixes: MAINTAINERS: Remove self from Broadcom SoCs
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 0 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0abecc528dac..b5a72848a3af 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2869,7 +2869,6 @@ 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
@@ -3015,7 +3014,6 @@ F: drivers/net/ethernet/broadcom/genet/
BROADCOM IPROC ARM ARCHITECTURE
M: Ray Jui <rjui@broadcom.com>
M: Scott Branden <sbranden@broadcom.com>
-M: Jon Mason <jonmason@broadcom.com>
M: bcm-kernel-feedback-list@broadcom.com
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
T: git git://github.com/broadcom/cygnus-linux.git