Files
ack-tegra/include/linux
Len Brown d326f44e5f Merge branch 'tboot' into release
Conflicts:
	drivers/acpi/acpica/hwsleep.c

Text conflict between:

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

which removed #include "actables.h"

and

09f98a825a
(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>
2012-03-30 16:38:59 -04:00
..
2012-01-22 15:08:43 -05:00
2012-01-10 16:30:42 -08:00
2012-02-20 19:46:36 +11:00
2012-01-12 20:13:04 -08:00
2012-01-12 20:13:08 -08:00
2012-01-09 13:52:09 +01:00
2012-01-17 15:40:51 -08:00
2012-01-12 20:13:10 -08:00
2012-01-12 15:23:04 -08:00
2012-03-05 15:49:42 -08:00
2012-02-28 15:06:33 -05:00
2012-01-24 12:25:14 -08:00