Conflicts:
	kernel/Makefile

There are conflicts in kernel/Makefile due to file moving in the
scheduler tree - resolve them.
Signed-off-by: NIngo Molnar <mingo@kernel.org>