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

Pull "Broadcom defconfig-arm64 changes for 4.12" from Florian Fainelli:

This pull request contains Broadcom ARM64-based SoCs defconfig updates for
4.12, please pull the following:

- Gerd enables the BCM2835 MMC driver which yields better performance than the
  default one (iProc)

* tag 'arm-soc/for-4.12/defconfig-arm64' of http://github.com/Broadcom/stblinux:
  arm64: set CONFIG_MMC_BCM2835=y in defconfig

diff --cc arch/arm64/configs/defconfig
Simple merge