tree b04a8677c0bbd2c64d0dfe3957bf32287813a148
parent 191b07541fcdd1de1ccc71d00bc28ca5060dd484
parent 5af897e433e6ba2963c0edcb12f2f75c53d5fae4
parent 431c30f74cdffba6456b52742e80f9b629228940
author Zhang Rui <rui.zhang@intel.com> 1463557028 +0800
committer Zhang Rui <rui.zhang@intel.com> 1463557028 +0800

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