Merge tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux into...

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

diff --cc arch/arm/Kconfig.debug
Simple merge