restore tegra3_thermal.c
fixed conflicts