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)
Conflicts:
arch/x86/kernel/signal_64.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Trivial merge