Merge branch 'tboot' into release
Conflicts: drivers/acpi/acpica/hwsleep.c Text conflict between: 2feec47d (ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers) which removed #include "actables.h" and 09f98a82 (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>
Showing
Please register or sign in to comment