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>

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>