Merge branches 'acpi-properties' and 'acpi-processor' into linux-next

* acpi-properties:
  ACPI: property: Fix type detection of unified integer reading functions

* acpi-processor:
  Revert "ACPI: processor: Split out thermal initialization from ACPI PSS"