tree fd88c7baf0cfdb84b5b38605d825aab56a93dba9
parent c75960aa7a4ef09bb768fa474071f4190adae49c
parent e35dbb4d4b4499e8a013564f0753dabc1c49e9d9
author Zhang Rui <rui.zhang@intel.com> 1446773453 +0800
committer Zhang Rui <rui.zhang@intel.com> 1446773453 +0800

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