• Len Brown's avatar
    Merge branch 'tboot' into release · d326f44e
    Len Brown authored
    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: default avatarLen Brown <len.brown@intel.com>
    d326f44e
osl.c 36.2 KB