Skip to content
Commit 0962f402 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/prototypes' into x86-v28-for-linus-phase1 



Conflicts:
	arch/x86/kernel/process_32.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 19268ed7 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