From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 18 Aug 2017 21:59:07 +0000 (+0200)
Subject: Merge tag 'arm-soc/for-4.14/defconfig-arm64' of http://github.com/Broadcom/stblinux... 
X-Git-Tag: v4.14-rc1~68^2~1^2~4
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=32f4049a1f62abe95a3f1da83402d510a6ec5487;p=linux.git

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

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
---

32f4049a1f62abe95a3f1da83402d510a6ec5487