diff options
| author |   Olof Johansson <olof@lixom.net> | 2013-02-11 19:37:51 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-11 19:37:51 -0800 |
| commit | 1c75c4210009d5cceced76af316c51f9e56ce630 (patch) | |
| tree | cfa3600b25fe8ca385ddc6a2cd230da876312dcb /arch/arm/mach-prima2/headsmp.S | |
| parent | Merge tag 'mxs-soc-3.9' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/soc (diff) | |
| parent | arm: socfpga: Add SMP support for actual socfpga harware (diff) | |
| download | linux-dev-1c75c4210009d5cceced76af316c51f9e56ce630.tar.xz linux-dev-1c75c4210009d5cceced76af316c51f9e56ce630.zip | |
Merge branch 'socfpga/hw' into next/soc
From Dinh Nguyen, this is a series of patches introducing support for
socfpga hardware (Altera Cyclone5). It also includes a cleanup that
moves some of the ARMv7 cache maintenance functions to a common location,
since three other platforms aready implemented it separately.
* socfpga/hw:
arm: socfpga: Add SMP support for actual socfpga harware
arm: Add v7_invalidate_l1 to cache-v7.S
arm: socfpga: Add entries to enable make dtbs socfpga
arm: socfpga: Add new device tree source for actual socfpga HW
Trivial conflict in arch/arm/mach-tegra/headsmp.S.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-prima2/headsmp.S')
0 files changed, 0 insertions, 0 deletions