Ingo Molnar fc6fc7f1b1 Merge branch 'linus' into x86/apic ... Conflicts: arch/x86/mach-default/setup.c Semantic conflict resolution: arch/x86/kernel/setup.c Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-02-22 20:05:19 +01:00
..
realmode	x86 ACPI: normalize segment descriptor register on resume	2008-07-05 08:25:40 +02:00
Makefile	kbuild, suspend, x86: fix rebuild of wakeup.bin	2008-05-04 20:04:45 +02:00
boot.c	x86, apic: remove duplicate asm/apic.h inclusions	2009-02-17 17:52:44 +01:00
cstate.c	Merge branch 'cpus4096-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-01-10 06:12:18 -08:00
processor.c	ACPI: Disable the C2C3_FFH access mode HW has no MWAIT support	2008-07-16 23:27:04 +02:00
sleep.c	Merge branch 'linus' into x86/apic	2009-02-13 09:44:22 +01:00
sleep.h	x86: move suspend wakeup code to C	2008-04-17 17:41:37 +02:00
wakeup_32.S	x86: move suspend wakeup code to C	2008-04-17 17:41:37 +02:00
wakeup_64.S	x86_64: Fix S3 fail path	2009-02-21 21:58:18 -05:00
wakeup_rm.S	x86: move suspend wakeup code to C	2008-04-17 17:41:37 +02:00