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

ACPI: processor: unify arch_acpi_processor_cleanup_pdc

2009-12-22 03:24:14 -05:00

sleep.c

x86, nx: Mark the ACPI resume trampoline code as +x

2011-02-07 09:07:13 +01:00

sleep.h

x86: move suspend wakeup code to C

2008-04-17 17:41:37 +02:00

wakeup_32.S

Rename .text.page_aligned to .text..page_aligned.

2010-03-03 11:26:00 +01:00

wakeup_64.S

Merge branches 'x86/acpi', 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/mm', 'x86/signal' and 'x86/urgent'; commit 'v2.6.29-rc6' into x86/core

2009-02-24 21:50:43 +01:00

wakeup_rm.S

x86: move suspend wakeup code to C

2008-04-17 17:41:37 +02:00