Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...
authorZhang Rui <rui.zhang@intel.com>
Fri, 6 Nov 2015 01:30:53 +0000 (09:30 +0800)
committerZhang Rui <rui.zhang@intel.com>
Fri, 6 Nov 2015 01:30:53 +0000 (09:30 +0800)
commitc422a8ed6fb5ba0c318ae8b31f881e9f2f2f65a1
treefd88c7baf0cfdb84b5b38605d825aab56a93dba9
parentc75960aa7a4ef09bb768fa474071f4190adae49c
parente35dbb4d4b4499e8a013564f0753dabc1c49e9d9
Merge branch 'linus' of git://git./linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc