Merge branches 'misc', 'soc', 'soc-eduardo' and 'int3404-thermal' of .git into next

diff --cc drivers/thermal/Kconfig
Simple merge

diff --cc drivers/thermal/Makefile
Simple merge

diff --cc drivers/thermal/cpu_cooling.c
Simple merge

diff --cc drivers/thermal/thermal_core.c
Simple merge