commit | c422a8ed6fb5ba0c318ae8b31f881e9f2f2f65a1 | [log] [tgz] |
---|---|---|
author | Zhang Rui <rui.zhang@intel.com> | Fri Nov 06 09:30:53 2015 +0800 |
committer | Zhang Rui <rui.zhang@intel.com> | Fri Nov 06 09:30:53 2015 +0800 |
tree | fd88c7baf0cfdb84b5b38605d825aab56a93dba9 | |
parent | c75960aa7a4ef09bb768fa474071f4190adae49c [diff] | |
parent | e35dbb4d4b4499e8a013564f0753dabc1c49e9d9 [diff] |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc