diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 15:33:54 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-07 16:09:25 +0200 |
| commit | 147de9757d49768b1163bcb02eb86039628ab47f (patch) | |
| tree | 76d13905dd49b1cdceb417d42fb14fecc1e71433 /arch/arm/mach-mv78xx0/Kconfig | |
| parent | 800daa61a3f20d7ea2243621985ff5744eb2f246 (diff) | |
| parent | 2dc9e0b9f162af7e2047176a31716eac5301916f (diff) | |
Merge tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux into next/soc
Merge "the second part of the Broadcom ARM-based SoC changes" from Florian Fainelli:
- Florian updates the DEBUG_UART_BCM5301X entry to cover both NS and NSP SoCs
since they both have the same location
* tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux:
ARM: debug: Enable DEBUG_BCM_5301X for Northstar Plus SoCs
Diffstat (limited to 'arch/arm/mach-mv78xx0/Kconfig')
0 files changed, 0 insertions, 0 deletions