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)
commit6d89c73ca5813768a2cc66f7420ac0cbddf4f37d
tree7f08e03449491e18c20fd6a29a70519f14da0eed
parent275087fc3ef5af5d20b5cab1403bd29d12311c6a
parent0386e9ce5877ee73e07675529d5ae594d00f0900
Merge tag 'arm-soc/for-5.8/soc-fixes' of https://github.com/Broadcom/stblinux into arm/fixes

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>