Ingo Molnar eadb8a091b Merge branch 'linus' into tracing/hw-breakpoints ... Conflicts: arch/x86/Kconfig arch/x86/kernel/traps.c arch/x86/power/cpu.c arch/x86/power/cpu_32.c kernel/Makefile Semantic conflict: arch/x86/kernel/hw_breakpoint.c Merge reason: Resolve the conflicts, move from put_cpu_no_sched() to put_cpu() in arch/x86/kernel/hw_breakpoint.c. Signed-off-by: Ingo Molnar <mingo@elte.hu>		2009-06-17 12:56:49 +02:00
..
cpu.c	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00
hibernate_32.c	x86, hibernate: fix breakage on x86_32 with CONFIG_NUMA set	2008-11-12 23:28:51 +01:00
hibernate_64.c	pm: rework includes, remove arch ifdefs	2009-04-01 08:59:16 -07:00
hibernate_asm_32.S	x86: use _types.h headers in asm where available	2009-02-13 11:35:01 -08:00
hibernate_asm_64.S	x86: use _types.h headers in asm where available	2009-02-13 11:35:01 -08:00
Makefile	x86: unify power/cpu_(32|64).c	2009-06-12 21:32:31 +02:00