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-06-11 21:02:17 +02:00
2009-06-15 13:27:38 +10:00
2009-06-12 11:32:58 +02:00
2009-06-11 21:02:49 +02:00
2008-12-09 02:27:39 -05:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:31 +02:00
2009-06-11 21:02:14 +02:00
2009-05-06 16:36:09 -07:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:50 +02:00
2009-06-11 21:02:50 +02:00
2009-06-11 21:02:51 +02:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:42 +02:00
2009-06-03 14:06:14 -04:00
2009-06-11 21:02:37 +02:00
2009-03-26 18:14:14 +01:00
2009-06-11 21:02:17 +02:00
2009-04-02 19:04:51 -07:00
2009-06-11 21:02:37 +02:00
2009-06-02 22:46:57 +02:00
2009-06-11 21:02:42 +02:00
2009-06-11 21:02:14 +02:00
2009-06-11 21:02:14 +02:00
2009-06-11 21:02:49 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:16 +02:00
2009-06-11 21:02:14 +02:00
2009-06-16 19:47:51 -07:00
2009-06-11 21:02:37 +02:00
2009-05-18 08:34:08 -07:00
2009-01-06 15:59:10 -08:00
2009-06-11 21:01:52 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:50 +02:00
2009-06-11 21:02:50 +02:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:50 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:42 +02:00
2009-06-11 21:02:22 +02:00
2009-04-21 19:40:00 -07:00
2009-06-11 21:02:50 +02:00
2009-03-29 23:36:01 -07:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:18 +02:00
2009-06-11 21:02:37 +02:00
2009-01-16 14:19:14 +01:00
2009-06-11 21:02:50 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:42 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:15 +02:00
2009-04-13 15:04:30 -07:00
2009-06-11 21:01:52 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:15 +02:00
2009-03-26 18:14:21 +01:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:01:52 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:42 +02:00
2009-06-11 21:02:50 +02:00
2009-03-30 22:05:17 +10:30
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:17 +02:00
2009-06-11 21:02:50 +02:00
2009-06-11 21:02:15 +02:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:16 +02:00
2009-06-11 21:02:37 +02:00
2009-06-11 21:02:42 +02:00
2009-06-14 14:12:18 -07:00