Merge branch 'x86/tracehook' into x86-v28-for-linus-phase1
authorIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 16:16:40 +0000 (18:16 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 6 Oct 2008 16:16:40 +0000 (18:16 +0200)
commitb159d7a989e53ab3529084348aa80441520b8575
tree416512130cf80ded4cd88fc064d0b28c8220616f
parent0962f402af1bb0b53ccee626785d202a10c12fff
parent4ab4ba32aa16b012cb0faabf1a27952508fe67f2
Merge branch 'x86/tracehook' into x86-v28-for-linus-phase1

Conflicts:
arch/x86/kernel/signal_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/ptrace.c
arch/x86/kernel/signal_32.c
arch/x86/kernel/signal_64.c
include/asm-x86/ptrace.h
include/asm-x86/thread_info.h