Skip to content
Commit 046fd537 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/tracehook', 'x86/xsave' and 'x86/prototypes' into x86/signal 



Conflicts:
	arch/x86/kernel/signal_64.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 70bb0896 4ab4ba32 fe47784b 8d7ccaa5
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment