]> 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)
commit0ebab675519be2190858f190263d9c04a99fc5a3
tree6c87b2d168a4665411a9e16b9f481599f2db25bc
parent9457d215784ca0953423ab5489e4ca0cbbac8a04
parent75e54d0aeb21f9217b91de59fe0ffb181c8932a5
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