Merge branches 'thermal-intel' and 'thermal-core' into next
authorZhang Rui <rui.zhang@intel.com>
Mon, 8 Aug 2016 02:59:35 +0000 (10:59 +0800)
committerZhang Rui <rui.zhang@intel.com>
Mon, 8 Aug 2016 02:59:35 +0000 (10:59 +0800)
commit1577ddfac75ff9690ebd0d210bc7f1345c9d29ef
treeaf9d348ccc26df846c7c69e62624465f42205745
parent70c50ee72eebb3d1e3aae7450269fd8d8074c610
parent165989a5b667b90589f21c8affe496ad21f08591
Merge branches 'thermal-intel' and 'thermal-core' into next