From: Olof Johansson Date: Mon, 19 Jun 2017 03:14:46 +0000 (-0700) Subject: Merge tag 'arm-soc/for-4.13/soc' of http://github.com/Broadcom/stblinux into next/soc X-Git-Tag: v4.13-rc1~169^2~15 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=b9e44ddbe528217090a8d8c54fc99cc71885949f;p=linux.git Merge tag 'arm-soc/for-4.13/soc' of http://github.com/Broadcom/stblinux into next/soc This pull request contains Broadcom ARM-based SoCs (non Device Tree) changes: - Jon updates the Kconfig entry for Northstar Plus to have THERMAL and THERMAL_OF selected in order to get the NS/NSP thermal driver dependencies to be satistfied * tag 'arm-soc/for-4.13/soc' of http://github.com/Broadcom/stblinux: ARM: BCM: Enable thermal support for NSP SoCs Signed-off-by: Olof Johansson --- b9e44ddbe528217090a8d8c54fc99cc71885949f