Ingo Molnar daab7fc734 Merge commit 'v2.6.36-rc3' into x86/memblock ...

Conflicts:
	arch/x86/kernel/trampoline.c
	mm/memblock.c

Merge reason: Resolve the conflicts, update to latest upstream.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

2010-08-31 09:45:46 +02:00

..

realmode

x86: Use symbolic MSR names

2010-07-21 21:23:40 -07:00

boot.c

x86, irq: Rename gsi_end gsi_top, and fix off by one errors

2010-06-09 13:34:06 -07:00

cstate.c

ACPI: skip checking BM_STS if the BIOS doesn't ask for it

2010-07-22 16:54:27 -04:00

Makefile

ACPI: processor: unify arch_acpi_processor_cleanup_pdc

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

sleep.c

Merge commit 'v2.6.36-rc3' into x86/memblock

2010-08-31 09:45:46 +02: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