| commit | 07cb1ec1ae18828e0b187ef67e9e465623d1ea7b | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Tue Mar 11 13:18:21 2014 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Tue Mar 11 13:18:36 2014 -0700 |
| tree | 774e837518dedff75b65945fc1c728fbe30269fd | |
| parent | 42dc836dbe719b0f7afef1794a12a53fa6d7f723 [diff] | |
| parent | fdf4850cb5b2e5e549a18b8b41abb001bfb19e9c [diff] |
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>