Commits
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>
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>