Skip to content
Commit 28f73e51 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/delay 



Conflicts:

	arch/x86/kernel/tsc_32.c

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents f3f3149f 543cf4cb
Expand all Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment