Merge branch 'linus' into sched/core, to resolve conflict
Conflicts:
arch/sparc/include/asm/topology_64.h
Signed-off-by:
Ingo Molnar <mingo@kernel.org>
Please register or sign in to comment
Conflicts:
arch/sparc/include/asm/topology_64.h
Signed-off-by:
Ingo Molnar <mingo@kernel.org>