summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-03-11 13:18:21 -0700
committerOlof Johansson <olof@lixom.net>2014-03-11 13:18:36 -0700
commit07cb1ec1ae18828e0b187ef67e9e465623d1ea7b (patch)
tree774e837518dedff75b65945fc1c728fbe30269fd /MAINTAINERS
parent42dc836dbe719b0f7afef1794a12a53fa6d7f723 (diff)
parentfdf4850cb5b2e5e549a18b8b41abb001bfb19e9c (diff)
downloadlinux-07cb1ec1ae18828e0b187ef67e9e465623d1ea7b.tar.gz
linux-07cb1ec1ae18828e0b187ef67e9e465623d1ea7b.tar.bz2
linux-07cb1ec1ae18828e0b187ef67e9e465623d1ea7b.zip
Merge tag 'armsoc/for-3.15/soc-2' of git://github.com/broadcom/mach-bcm into next/soc
Merge "ARM: mach-bcm soc updates" from Matt Porter: - add BCM5301x support - remove GENERIC_TIME * tag 'armsoc/for-3.15/soc-2' of git://github.com/broadcom/mach-bcm: ARM: BCM5301X: workaround suppress fault ARM: BCM5301X: add early debugging support ARM: BCM5301X: initial support for the BCM5301X/BCM470X SoCs with ARM CPU ARM: mach-bcm: Remove GENERIC_TIME Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 8 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e4812f9319bd..af8c8edb8fb5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1889,6 +1889,14 @@ F: arch/arm/boot/dts/bcm2835*
F: arch/arm/configs/bcm2835_defconfig
F: drivers/*/*bcm2835*
+BROADCOM BCM5301X ARM ARCHICTURE
+M: Hauke Mehrtens <hauke@hauke-m.de>
+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*
+
BROADCOM TG3 GIGABIT ETHERNET DRIVER
M: Nithin Nayak Sujir <nsujir@broadcom.com>
M: Michael Chan <mchan@broadcom.com>