tree 8c7a32b37e74155324ae2b556fcc42718ccf29a3
parent ecf1f014325ba60f4df35edae1a357c67c5d4eb1
parent b8a216269ec0ce2e961d32e6d640d7010b8a818e
author Ingo Molnar <mingo@kernel.org> 1383720637 +0100
committer Ingo Molnar <mingo@kernel.org> 1383720637 +0100

Merge branch 'sched/core' into core/locking, to prepare the kernel/locking/ file move

Conflicts:
	kernel/Makefile

There are conflicts in kernel/Makefile due to file moving in the
scheduler tree - resolve them.

Signed-off-by: Ingo Molnar <mingo@kernel.org>