| commit | 147de9757d49768b1163bcb02eb86039628ab47f | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Thu Jul 07 15:33:54 2016 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Thu Jul 07 16:09:25 2016 +0200 |
| tree | 76d13905dd49b1cdceb417d42fb14fecc1e71433 | |
| 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