git.ipfire.org Git - people/ms/linux.git/commit

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>

author	Len Brown <len.brown@intel.com>
	Fri, 30 Mar 2012 20:35:53 +0000 (16:35 -0400)
committer	Len Brown <len.brown@intel.com>
	Fri, 30 Mar 2012 20:38:59 +0000 (16:38 -0400)
commit	d326f44e5f2204c7a24db69bfc6dd3fe5f86182b
tree	21473db646b06fd462bbc8f3690732ba1bb2d018	tree \| snapshot
parent	ec612fcf43e09f5e05d37baf4d3f138b3fcc2f3d	commit \| diff
parent	e840dfe334b4791af07aadee1b2cf3c7c7363581	commit \| diff

drivers/acpi/acpica/hwsleep.c	diff1 \|	diff2 \|	blob \| history
drivers/acpi/osl.c	diff1 \|	diff2 \|	blob \| history
include/acpi/acexcep.h	diff1 \|	diff2 \|	blob \| history