Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal
authorIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 12:53:01 +0000 (14:53 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 12:53:01 +0000 (14:53 +0200)
Conflicts:
arch/x86/kernel/signal_64.c

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

Trivial merge