git.baikalelectronics.ru Git - kernel.git/commit

Merge branch 'tboot' into release

Conflicts:
drivers/acpi/acpica/hwsleep.c

Text conflict between:

7e07c95938ccf2f0ca0711273db9bf864fe0d211
(ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers)

which removed #include "actables.h"

and

108cc183acf521ac48a44208ee1855f4de8c8df6
(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	d566179aaf105b141bd2785424641bf4eff611ed
tree	21473db646b06fd462bbc8f3690732ba1bb2d018	tree \| snapshot
parent	ef5f28591066173a56547bb5b28c771a8310ec46	commit \| diff
parent	eb54a89083428382b9b4258751900702c3f97042	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