From: Len Brown <len.brown@intel.com>
Date: Fri, 30 Mar 2012 20:35:53 +0000 (-0400)
Subject: Merge branch 'tboot' into release
X-Git-Tag: v3.4-rc1~18^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d326f44e5f2204c7a24db69bfc6dd3fe5f86182b;p=pandora-kernel.git

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

d326f44e5f2204c7a24db69bfc6dd3fe5f86182b
diff --cc drivers/acpi/acpica/hwsleep.c
index 8ab325cefa68,af702a7a69d9..0ed85cac3231
--- a/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