Merge branch 'tboot' into release

Conflicts:
	drivers/acpi/acpica/hwsleep.c

Text conflict between:

569ba8018b6c7df99150cc6bffd23609f8c5048a
(ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers)

which removed #include "actables.h"

and

f9ca66505c730b6fc4a964847232ed5b809677d2
(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>

diff --cc drivers/acpi/acpica/hwsleep.c
index 8ab325cefa68a4eea8be1c1c320c5e8c2ceffbc3,af702a7a69d9a6c9af64d762b57853630f30c979..0ed85cac32314f956de3092f7087e3ab011b5ba7
--- 1/drivers/acpi/acpica/hwsleep.c
--- 2/drivers/acpi/acpica/hwsleep.c
+++ b/drivers/acpi/acpica/hwsleep.c
@@@ -43,8 -43,9 +43,8 @@@
   */
  
  #include <acpi/acpi.h>
+ #include <linux/acpi.h>
  #include "accommon.h"
- #include <linux/tboot.h>
 -#include "actables.h"
  #include <linux/module.h>
  
  #define _COMPONENT          ACPI_HARDWARE

diff --cc drivers/acpi/osl.c
Simple merge

diff --cc include/acpi/acexcep.h
Simple merge