Skip to content
Commit 07bbc16a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'timers/urgent' into x86/xen 



Conflicts:
	arch/x86/kernel/process_32.c
	arch/x86/kernel/process_64.c

Manual merge:

	arch/x86/kernel/smpboot.c

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