diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-10-18 12:27:30 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2018-10-18 12:27:30 +0200 |
| commit | 3f858ae02c196c1f97b88f56a28ff0263ac909f8 (patch) | |
| tree | d342b92b1b57345b98343a6078077f73e6f3f518 | |
| parent | d1551f7a5aed809bb1e912da9faf36927e739ca0 (diff) | |
| parent | 1cdda9486f5103fb133f88e662e48c504adbb779 (diff) | |
| parent | 1fca4ba0b14d79e8a43822f7b0c7288efba4c9fa (diff) | |
| download | linux-3f858ae02c196c1f97b88f56a28ff0263ac909f8.tar.bz2 | |
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