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

Pull "Broadcom soc-arm64 changes for 4.9" from Florian Fainelli:

This pull request contains Broadcom ARM64-based SoC changes for 4.9, please pull
the following:

- collective effort from Florian, Doug and Markus to add the ARCH_BRCMSTB Kconfig
  symbol to the ARM64 kernel build, which is purposedly the same as the ARM/Linux
  one in order not to update any driver dependencies

* tag 'arm-soc/for-4.9/soc-arm64' of http://github.com/Broadcom/stblinux:
  arm64: Add Broadcom Set Top Box Kconfig entry point

diff --cc arch/arm64/Kconfig.platforms
Simple merge