Merge tag 'arm-soc/for-4.14/defconfig-arm64' of http://github.com/Broadcom/stblinux...
authorArnd Bergmann <arnd@arndb.de>
Fri, 18 Aug 2017 21:59:07 +0000 (23:59 +0200)
committerArnd Bergmann <arnd@arndb.de>
Fri, 18 Aug 2017 21:59:07 +0000 (23:59 +0200)
Pull "Broadcom defconfig-arm64 changes for 4.14" from Florian Fainelli:

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

- Markus enables the Broadcom STB AVS thermal monitoring driver as a module
  which is currently queued in Rui Zhang's tree

* tag 'arm-soc/for-4.14/defconfig-arm64' of http://github.com/Broadcom/stblinux:
  arm64: defconfig: add CONFIG_BRCMSTB_THERMAL

1  2 
arch/arm64/configs/defconfig

Simple merge