Merge branch 'fixes' into linux-next

* fixes:
  thermal: intel: x86_pkg_temp_thermal: Fix bogus trip temperature

Author: rafaeljw

drivers/thermal/intel/x86_pkg_temp_thermal.c

@@ -329,6 +329,7 @@ static int pkg_temp_thermal_device_add(unsigned int cpu)
 	tj_max = intel_tcc_get_tjmax(cpu);
 	if (tj_max < 0)
 		return tj_max;
+	tj_max *= 1000;
 
 	zonedev = kzalloc(sizeof(*zonedev), GFP_KERNEL);
 	if (!zonedev)