From: Zhang Rui <rui.zhang@intel.com>
Date: Fri, 5 May 2017 12:30:03 +0000 (+0800)
Subject: Merge branches 'thermal-core' and 'thermal-intel' into next
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a6128f47f7940d8388ca7c8623fbe24e52f8fae6;p=people%2Fms%2Flinux.git

Merge branches 'thermal-core' and 'thermal-intel' into next
---

a6128f47f7940d8388ca7c8623fbe24e52f8fae6