| commit | eadb8a091b27a840de7450f84ecff5ef13476424 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@elte.hu> | Wed Jun 17 12:52:15 2009 +0200 |
| committer | Ingo Molnar <mingo@elte.hu> | Wed Jun 17 12:56:49 2009 +0200 |
| tree | 58c3782d40def63baa8167f3d31e3048cb4c7660 | |
| parent | 73874005cd8800440be4299bd095387fff4b90ac [diff] | |
| parent | 65795efbd380a832ae508b04dba8f8e53f0b84d9 [diff] |
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>