tree 3a8dcb27b32be11454d14718991ad1d4c46a48d0
parent 13b86f50eaaddaea4bdd2fe476fd12e6a0951add
parent c8da6cdef57b459ac0fd5d9d348f8460a575ae90
author Zhang Rui <rui.zhang@intel.com> 1526002641 +0800
committer Zhang Rui <rui.zhang@intel.com> 1526002641 +0800

Merge branch 'thermal-soc' into next