mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/
synced 2026-11-19 20:00:30 +00:00
Conflicts: drivers/acpi/acpica/hwsleep.c Text conflict between:2feec47d4c(ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers) which removed #include "actables.h" and09f98a825a(x86, acpi, tboot: Have a ACPI os prepare sleep instead of calling tboot_sleep.) which removed #include <linux/tboot.h> The resolution is to remove them both. Signed-off-by: Len Brown <len.brown@intel.com>
1595 lines
36 KiB
1595 lines
36 KiB