Merge branch 'tboot' into release

Conflicts:
	drivers/acpi/acpica/hwsleep.c

Text conflict between:

2feec47d4c5f80b05f1650f5a24865718978eea4
(ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers)

which removed #include "actables.h"

and

09f98a825a821f7a3f1b162f9ed023f37213a63b
(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 8ab325c,af702a7..0ed85ca
--- 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