]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion...
authorZhang Rui <rui.zhang@intel.com>
Wed, 22 Feb 2017 07:35:06 +0000 (15:35 +0800)
committerZhang Rui <rui.zhang@intel.com>
Wed, 22 Feb 2017 07:35:06 +0000 (15:35 +0800)
commiteebb689a130e9e68f180dd4805d5e6cc64cbd582
tree48bbd4773378bc285f30edb813de8899cde0d245
parent411a5e3834a3c6ca7adbd8ec28980bbc0ae7d966
parent4873d381a04ad98bfed94d1b29b84ad90a3213c7
parentf6ffd0a210f2d920452030fa17238646ad84d434
parent611594994e65deb4b92da474310a288b059ce6bf
Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion' into next
drivers/thermal/cpu_cooling.c
drivers/thermal/thermal_core.c