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
..
asm	Merge branch 'linus' into tracing/hw-breakpoints	2009-06-17 12:56:49 +02:00