linux/arch/x86/kernel/acpi
Ingo Molnar 8460b3e5bc Merge commit 'v2.6.38' into x86/mm
Conflicts:
	arch/x86/mm/numa_64.c

Merge reason: Resolve the conflict, update the branch to .38.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
2011-03-15 08:29:44 +01:00
..
realmode x86: Use symbolic MSR names 2010-07-21 21:23:40 -07:00
boot.c Merge commit 'v2.6.38' into x86/mm 2011-03-15 08:29:44 +01:00
cstate.c Merge branch 'x86-idle-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 2010-10-21 13:45:38 -07:00
Makefile
sleep.c x86, nx: Mark the ACPI resume trampoline code as +x 2011-02-07 09:07:13 +01:00
sleep.h
wakeup_32.S
wakeup_64.S
wakeup_rm.S