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

Merge branch 'linus' into sched/core, to resolve conflict 



Conflicts:
	arch/sparc/include/asm/topology_64.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 960d447b c46a024e
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