linux/arch/x86/kernel/acpi
H. Peter Anvin de65d816aa Merge remote-tracking branch 'origin/x86/boot' into x86/mm2
Coming patches to x86/mm2 require the changes and advanced baseline in
x86/boot.

Resolved Conflicts:
	arch/x86/kernel/setup.c
	mm/nobootmem.c

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
2013-01-29 15:10:15 -08:00
..
boot.c Merge remote-tracking branch 'origin/x86/boot' into x86/mm2 2013-01-29 15:10:15 -08:00
cstate.c Disintegrate asm/system.h for X86 2012-03-28 18:11:12 +01:00
Makefile x86, realmode: Move ACPI wakeup to unified realmode code 2012-05-08 11:46:05 -07:00
sleep.c ACPI / Sleep: add acpi_sleep=nonvs_s3 parameter 2012-11-15 00:16:02 +01:00
sleep.h ACPI/x86: revert 'x86, acpi: Call acpi_enter_sleep_state via an asmlinkage C function from assembler' 2012-07-30 21:10:16 -04:00
wakeup_32.S ACPI/x86: revert 'x86, acpi: Call acpi_enter_sleep_state via an asmlinkage C function from assembler' 2012-07-30 21:10:16 -04:00
wakeup_64.S ACPI/x86: revert 'x86, acpi: Call acpi_enter_sleep_state via an asmlinkage C function from assembler' 2012-07-30 21:10:16 -04:00