diff options
author | Zhang Rui <rui.zhang@intel.com> | 2014-12-09 04:37:35 +0100 |
---|---|---|
committer | Zhang Rui <rui.zhang@intel.com> | 2014-12-09 04:37:35 +0100 |
commit | 9c1e4550b5cbe17ff68ce631356190ef9a565386 (patch) | |
tree | 04cd872bd8afd2b2fe143e2c17a180a39d1a275c /arch/arm/boot/compressed/misc.c | |
parent | Linux 3.18-rc7 (diff) | |
parent | thermal: of: Extend current of-thermal.c code to allow setting emulated temp (diff) | |
download | linux-9c1e4550b5cbe17ff68ce631356190ef9a565386.tar.xz linux-9c1e4550b5cbe17ff68ce631356190ef9a565386.zip |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into eduardo-soc-thermal
Diffstat (limited to 'arch/arm/boot/compressed/misc.c')
0 files changed, 0 insertions, 0 deletions