Merge branch 'linus' into tracing/hw-breakpoints
authorIngo Molnar <mingo@elte.hu>
Wed, 17 Jun 2009 10:52:15 +0000 (12:52 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 17 Jun 2009 10:56:49 +0000 (12:56 +0200)
commiteadb8a091b27a840de7450f84ecff5ef13476424
tree58c3782d40def63baa8167f3d31e3048cb4c7660
parent73874005cd8800440be4299bd095387fff4b90ac
parent65795efbd380a832ae508b04dba8f8e53f0b84d9
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>
16 files changed:
arch/x86/Kconfig
arch/x86/include/asm/processor.h
arch/x86/kernel/Makefile
arch/x86/kernel/hw_breakpoint.c
arch/x86/kernel/kgdb.c
arch/x86/kernel/process.c
arch/x86/kernel/process_32.c
arch/x86/kernel/process_64.c
arch/x86/kernel/signal.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/traps.c
arch/x86/power/cpu.c
kernel/Makefile
kernel/trace/Kconfig
kernel/trace/Makefile
samples/Kconfig