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
..
acpica	Merge branch 'tboot' into release	2012-03-30 16:38:59 -04:00
apei	Merge branch 'apei' into release	2012-03-30 16:14:02 -04:00
ac.c
acpi_ipmi.c
acpi_memhotplug.c
acpi_pad.c
battery.c
bgrt.c	ACPI: Add support for exposing BGRT data	2012-03-30 04:09:24 -04:00
blacklist.c
bus.c	ACPI: export acpi_kobj	2012-03-30 04:09:05 -04:00
button.c
cm_sbs.c
container.c
custom_method.c
debugfs.c
dock.c
ec.c	ACPI: ec: Do request_region outside WARN()	2012-03-30 01:41:35 -04:00
ec_sys.c
event.c
fan.c
glue.c
hed.c
internal.h
Kconfig	ACPI: Add support for exposing BGRT data	2012-03-30 04:09:24 -04:00
Makefile	ACPI: Add support for exposing BGRT data	2012-03-30 04:09:24 -04:00
numa.c
nvs.c	ACPI / PM: print physical addresses consistently with other parts of kernel	2012-03-30 02:46:57 -04:00
osl.c	Merge branch 'tboot' into release	2012-03-30 16:38:59 -04:00
pci_bind.c
pci_irq.c
pci_link.c
pci_root.c
pci_slot.c
power.c	ACPI: Add interface to register/unregister device to/from power resources	2012-03-30 01:47:20 -04:00
proc.c
processor_core.c
processor_driver.c	Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'misc', 'red-hat-bz-727865', 'thermal', 'throttling', 'turbostat' and 'video' into release	2012-03-30 16:10:37 -04:00
processor_idle.c	Merge branches 'acpica', 'bgrt', 'bz-11533', 'cpuidle', 'ec', 'hotplug', 'misc', 'red-hat-bz-727865', 'thermal', 'throttling', 'turbostat' and 'video' into release	2012-03-30 16:10:37 -04:00
processor_perflib.c
processor_thermal.c	ACPI: Do cpufreq clamping for throttling per package v2	2012-03-22 02:16:14 -04:00
processor_throttling.c	ACPI throttling: fix endian bug in acpi_read_throttling_status()	2012-03-30 16:06:12 -04:00
reboot.c	ACPI: ignore FADT reset-reg-sup flag	2012-03-21 00:46:39 -04:00
sbs.c
sbshc.c
sbshc.h
scan.c	Merge branch 'd3' into release	2012-03-30 16:21:26 -04:00
sleep.c	Merge branch 'd3' into release	2012-03-30 16:21:26 -04:00
sleep.h
sysfs.c
tables.c
thermal.c	ACPI: Evaluate thermal trip points before reading temperature	2012-03-30 02:38:31 -04:00
utils.c
video.c	ACPI video: Don't start video device until its associated input device has been allocated	2012-03-30 15:47:52 -04:00
video_detect.c
wakeup.c