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

Pull "Broadcom defconfig changes for 4.15" from Florian Fainelli:

This pull request contains Broadcom ARM-based SoCs multi_v7_defconfig file
updates for 4.15, please pull the following:

- Florian enables the Broadcom Hurricane 2 SoC in multi_v7_defconfig
  (CONFIG_ARCH_BCM_HR2)

* tag 'arm-soc/for-4.15/defconfig' of http://github.com/Broadcom/stblinux:
  ARM: multi_v7_defconfig: Enable CONFIG_ARCH_BCM_HR2

diff --cc arch/arm/configs/multi_v7_defconfig
Simple merge