tree 10fe0c97da03e6365df883d5c8ffed52a47f8d45
parent 39da7c509acff13fc8cb12ec1bb20337c988ed36
parent 05d7839aa290901429d8edcd8f7974c9df2bcaa5
author Zhang Rui <rui.zhang@intel.com> 1494070253 +0800
committer Zhang Rui <rui.zhang@intel.com> 1494070253 +0800

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc