arch/sparc/include/asm/topology_64.h · 23b7776290b10297fe2cae0fb5f166a4f2c68121 · Kirill Smelkov / linux · GitLab

Find file Blame History Permalink

Merge branch 'linus' into sched/core, to resolve conflict · f407a825
Ingo Molnar authored Jun 02, 2015
```
Conflicts:
	arch/sparc/include/asm/topology_64.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
```
f407a825

topology_64.h 1.22 KB