mirror of
https://github.com/torvalds/linux.git
synced 2026-01-25 15:03:52 +08:00
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>