Merge tag 'arm-soc/for-4.8/soc-part2' of http://github.com/Broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Thu, 7 Jul 2016 13:33:54 +0000 (15:33 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 7 Jul 2016 14:09:25 +0000 (16:09 +0200)
commit147de9757d49768b1163bcb02eb86039628ab47f
tree76d13905dd49b1cdceb417d42fb14fecc1e71433
parent800daa61a3f20d7ea2243621985ff5744eb2f246
parent2dc9e0b9f162af7e2047176a31716eac5301916f
Merge tag 'arm-soc/for-4.8/soc-part2' of 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
arch/arm/Kconfig.debug