Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
Loading
Showing
with 31 additions and 10 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment