Merge branch 'linus' into sched/core, to resolve conflict
authorIngo Molnar <mingo@kernel.org>
Tue, 2 Jun 2015 06:05:42 +0000 (08:05 +0200)
committerIngo Molnar <mingo@kernel.org>
Tue, 2 Jun 2015 06:05:42 +0000 (08:05 +0200)
commitf407a8258610169cd8e975dba7f0b2824562014c
tree6c87b2d168a4665411a9e16b9f481599f2db25bc
parent960d447b94b22ceba286917056871d1dac8da697
parentc46a024ea5eb0165114dbbc8c82c29b7bcf66e71
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>
arch/sparc/include/asm/topology_64.h
arch/sparc/mm/init_64.c
kernel/sched/core.c