Merge tag 'arm-soc/for-5.8/soc-fixes' of https://github.com/Broadcom/stblinux into...
authorArnd Bergmann <arnd@arndb.de>
Sun, 28 Jun 2020 12:47:40 +0000 (14:47 +0200)
committerArnd Bergmann <arnd@arndb.de>
Sun, 28 Jun 2020 12:47:40 +0000 (14:47 +0200)
This pull request contains Broadcom ARM-based SoCs machine/Kconfig fixes
for 5.8, please pull the following:

- Matthew adds a missing select to permit the use of the standard ARM
  SP804 timers on Norsthstar Plus (NSP)

* tag 'arm-soc/for-5.8/soc-fixes' of https://github.com/Broadcom/stblinux:
  ARM: bcm: Select ARM_TIMER_SP804 for ARCH_BCM_NSP

Link: https://lore.kernel.org/r/20200619202250.19029-3-f.fainelli@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Trivial merge