drivers/cpufreq/cpufreq_stats.c: fix merge derp

Signed-off-by: kykdev <kykint@naver.com>
drivers/power/max17048_battery.c: fix merge derp

Signed-off-by: kykdev <kykint@naver.com>
drivers/thermal/msm_thermal.c: use Google's thermal driver instead of franco's

Conflicts occur with franco's original thermal driver when merging upstream patches from Google :(

Signed-off-by: kykdev <kykint@naver.com>