| commit | b9e44ddbe528217090a8d8c54fc99cc71885949f | [log] [tgz] |
|---|---|---|
| author | Olof Johansson <olof@lixom.net> | Sun Jun 18 20:14:46 2017 -0700 |
| committer | Olof Johansson <olof@lixom.net> | Sun Jun 18 20:14:46 2017 -0700 |
| tree | ec97bcf6603c5a268268154823d1eccf438886d2 | |
| parent | d28bcd53fa90549e00f7dbcdfc885dfe8409e8a2 [diff] | |
| parent | 27d9fa06c122b135ad7552fa3138c3b47e5776c5 [diff] |
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 <olof@lixom.net>