diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-11-26 00:30:46 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-26 00:30:46 +0100 |
| commit | 192a5e8c96d71c83190c96f737f6e780747204a4 (patch) | |
| tree | f83b93303ad1c6d5c36ac25e51f0e441c54d9283 /arch/arm/mach-orion5x/ls-chl-setup.c | |
| parent | 048f789b9531574894babde683e1c7ae2ae5e9de (diff) | |
| parent | e330ea5e8cea7ba58f0ba9d40063b13cf8639555 (diff) | |
Merge tag 'oxnas-arm-soc-for-4.10-v2' of https://github.com/OXNAS/linux into next/soc
Pull "ARM: OXNAS SoC updates for 4.10" from Neil Armstrong:
- Add SMP support for the Oxford Semiconductor OX820 SoC
from http://lkml.kernel.org/r/20161021085848.1754-1-narmstrong@baylibre.com
Changes since v1 Pull Request at : http://lkml.kernel.org/r/1305c61f-b1ef-7caf-7788-67e2b907e873@baylibre.com
- Clarify copyright dates in commit message
- Remove linux/arch/... lines from the top of the files
* tag 'oxnas-arm-soc-for-4.10-v2' of https://github.com/OXNAS/linux:
ARM: oxnas: Add OX820 config and makefile entry
ARM: oxnas: Add OX820 SMP support
Diffstat (limited to 'arch/arm/mach-orion5x/ls-chl-setup.c')
0 files changed, 0 insertions, 0 deletions