]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc24494827a77786472a3a989d1804bef507a49e2
tree6c87b2d168a4665411a9e16b9f481599f2db25bc
parent074087784fa5239f841087785f0b456e5a0b45a4
parentbab950f86ad034045ae30c38faa37b7ad8bd074a
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