From: Olof Johansson <olof@lixom.net>
Date: Tue, 11 Mar 2014 20:18:21 +0000 (-0700)
Subject: Merge tag 'armsoc/for-3.15/soc-2' of git://github.com/broadcom/mach-bcm into next/soc
X-Git-Tag: soc-3.15~17
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=07cb1ec1ae18828e0b187ef67e9e465623d1ea7b;p=karo-tx-linux.git

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>
---

07cb1ec1ae18828e0b187ef67e9e465623d1ea7b