+247
−0
File changed.
Preview size limit exceeded, changes collapsed.
+1
−0
Loading
Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more
Merging the Linaro Stable Kernel (LSK) linux-linaro-lsk-v3.18
bring with it a number of thermal monitoring/management
changes, some of which have conflicts with internal code
changes. To make the merge of linux-linaro-lsk-v3.18 as smooth
and easy to review as possible, merge in the LSK thermal topic
branch ahead of time. The conflicts resolutions can be more
easily reviewed this way.
Conflicts:
drivers/thermal/Makefile
drivers/thermal/thermal_core.c
include/linux/thermal.h
Change-Id: I110fd11c3c25bdc4d3d180b6e97f11c370681001
Signed-off-by:
Matt Wagantall <mattw@codeaurora.org>
File changed.
Preview size limit exceeded, changes collapsed.