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> |
||
|---|---|---|
| .. | ||
| Makefile | ||
| rcu.h | ||
| srcu.c | ||
| tiny.c | ||
| tiny_plugin.h | ||
| torture.c | ||
| tree.c | ||
| tree.h | ||
| tree_plugin.h | ||
| tree_trace.c | ||
| update.c | ||