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

* acpi-processor:
  ACPI: processor/idle: Annotate more functions to live in cpuidle section

* acpi-apei:
  ACPI: APEI: Fix double word in a comment