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
..
2009-05-27 00:41:34 -04:00
2009-06-17 12:56:49 +02:00
2009-06-16 21:20:39 -07:00
2009-06-16 21:15:42 -07:00
2009-06-16 19:07:25 -03:00
2009-06-16 13:09:51 -07:00
2009-06-15 03:02:23 -07:00
2009-06-10 07:26:41 +02:00
2009-06-15 03:02:23 -07:00
2009-06-16 19:48:00 -07:00