Merge branches 'thermal-core' and 'thermal-intel' into linux-next

* thermal-core:
  thermal: Directly use ida_alloc()/free()

* thermal-intel:
  intel: thermal: PCH: Drop ACPI_FADT_LOW_POWER_S0 check
  thermal: intel: x86_pkg_temp_thermal: Drop duplicate 'is' from comment