From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 18 Oct 2018 10:27:30 +0000 (+0200)
Subject: Merge branches 'acpi-pm' and 'pm-sleep'
X-Git-Tag: v5.4-rc1~2429^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3f858ae02c196c1f97b88f56a28ff0263ac909f8;p=platform%2Fkernel%2Flinux-rpi.git

Merge branches 'acpi-pm' and 'pm-sleep'

* acpi-pm:
  ACPI / PM: LPIT: Register sysfs attributes based on FADT

* pm-sleep:
  x86-32, hibernate: Adjust in_suspend after resumed on 32bit system
  x86-32, hibernate: Set up temporary text mapping for 32bit system
  x86-32, hibernate: Switch to relocated restore code during resume on 32bit system
  x86-32, hibernate: Switch to original page table after resumed
  x86-32, hibernate: Use the page size macro instead of constant value
  x86-32, hibernate: Use temp_pgt as the temporary page table
  x86, hibernate: Rename temp_level4_pgt to temp_pgt
  x86-32, hibernate: Enable CONFIG_ARCH_HIBERNATION_HEADER on 32bit system
  x86, hibernate: Extract the common code of 64/32 bit system
  x86-32/asm/power: Create stack frames in hibernate_asm_32.S
  PM / hibernate: Check the success of generating md5 digest before hibernation
  x86, hibernate: Fix nosave_regions setup for hibernation
  PM / sleep: Show freezing tasks that caused a suspend abort
  PM / hibernate: Documentation: fix image_size default value
---

3f858ae02c196c1f97b88f56a28ff0263ac909f8