Merge branch 'thermal-soc' into next
authorZhang Rui <rui.zhang@intel.com>
Fri, 11 May 2018 01:37:21 +0000 (09:37 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 11 May 2018 01:37:21 +0000 (09:37 +0800)
commit60abce9f43d812dfec6687a10ca30be380f6f97a
tree3a8dcb27b32be11454d14718991ad1d4c46a48d0
parent13b86f50eaaddaea4bdd2fe476fd12e6a0951add
parentc8da6cdef57b459ac0fd5d9d348f8460a575ae90
Merge branch 'thermal-soc' into next