Merge tag 'arm-soc/for-4.13/soc' of http://github.com/Broadcom/stblinux into next/soc
authorOlof Johansson <olof@lixom.net>
Mon, 19 Jun 2017 03:14:46 +0000 (20:14 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 19 Jun 2017 03:14:46 +0000 (20:14 -0700)
commitb9e44ddbe528217090a8d8c54fc99cc71885949f
treeec97bcf6603c5a268268154823d1eccf438886d2
parentd28bcd53fa90549e00f7dbcdfc885dfe8409e8a2
parent27d9fa06c122b135ad7552fa3138c3b47e5776c5
Merge tag 'arm-soc/for-4.13/soc' of 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 <olof@lixom.net>