Merge branch 'for-4.15/firmware' into for-4.15/thermal
authorThierry Reding <treding@nvidia.com>
Thu, 19 Oct 2017 14:31:13 +0000 (16:31 +0200)
committerThierry Reding <treding@nvidia.com>
Thu, 19 Oct 2017 14:31:13 +0000 (16:31 +0200)

Trivial merge