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

This commit is contained in:
Zhang Rui 2016-08-08 10:59:35 +08:00
commit 1577ddfac7
7 changed files with 18 additions and 3 deletions