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
..
platform	acpi: remove module.h include from platform/aclinux.h	2011-10-31 19:32:27 -04:00
acconfig.h	ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware	2012-03-22 01:44:49 -04:00
acexcep.h	Merge branch 'tboot' into release	2012-03-30 16:38:59 -04:00
acnames.h	ACPICA: Clarify METHOD_NAME* defines for full-pathname cases	2012-03-22 01:45:53 -04:00
acoutput.h	ACPICA: Fix unresolved name issue for no-debug and no-error-msg cases	2011-03-02 19:38:04 -05:00
acpi_bus.h	ACPI, PCI: Move acpi_dev_run_wake() to ACPI core	2012-03-30 02:21:18 -04:00
acpi_drivers.h	ACPI: Fix CONFIG_ACPI_DOCK=n compiler warning	2011-11-06 20:58:17 -05:00
acpi_numa.h	ACPI: Store SRAT table revision	2012-01-17 04:19:04 -05:00
acpi.h	ACPICA: Update all ACPICA copyrights and signons to 2011	2011-01-18 23:48:03 -05:00
acpiosxf.h	ACPICA: Add acpi_os_physical_table_override interface	2012-03-22 01:44:59 -04:00
acpixf.h	ACPICA: Update to version 20120320	2012-03-30 01:45:14 -04:00
acrestyp.h	ACPI 5.0: Support for all new resource descriptors	2012-01-17 03:36:30 -05:00
actbl.h	ACPICA: ACPI 5: Support for new FADT SleepStatus, SleepControl registers	2012-03-22 01:44:34 -04:00
actbl1.h	acpi/apei/einj: Add extensions to EINJ from rev 5.0 of acpi spec	2012-01-18 01:14:17 -05:00
actbl2.h	ACPICA: Header support for SLIC table	2011-03-23 00:18:18 -04:00
actbl3.h	ACPI 5.0: Add new/changed tables to headers	2012-01-17 03:36:28 -05:00
actypes.h	ACPICA: Sleep/Wake interfaces: optionally execute _GTS and _BFS	2012-03-26 21:16:25 -04:00
apei.h	module_param: make bool parameters really bool (drivers & misc)	2012-01-13 09:32:20 +10:30
button.h
container.h
hed.h	ACPI Hardware Error Device (PNP0C33) support	2010-05-19 22:40:24 -04:00
pdc_intel.h
processor.h	ACPI processor hotplug: Delay acpi_processor_start() call for hotplugged cores	2012-01-19 21:26:32 -05:00
reboot.h
video.h	i915: Fix opregion notifications	2011-07-13 11:19:47 -07:00