diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-11-06 01:50:37 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-11-06 01:50:37 -0500 |
| commit | c90423d1de12fbeaf0c898e1db0e962de347302b (patch) | |
| tree | 8c7a32b37e74155324ae2b556fcc42718ccf29a3 /arch/m32r | |
| parent | ecf1f014325ba60f4df35edae1a357c67c5d4eb1 (diff) | |
| parent | b8a216269ec0ce2e961d32e6d640d7010b8a818e (diff) | |
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>
Diffstat (limited to 'arch/m32r')
| -rw-r--r-- | arch/m32r/include/asm/Kbuild | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m32r/include/asm/Kbuild b/arch/m32r/include/asm/Kbuild index bebdc36ebb0a..2b58c5f0bc38 100644 --- a/arch/m32r/include/asm/Kbuild +++ b/arch/m32r/include/asm/Kbuild | |||
| @@ -3,3 +3,4 @@ generic-y += clkdev.h | |||
| 3 | generic-y += exec.h | 3 | generic-y += exec.h |
| 4 | generic-y += module.h | 4 | generic-y += module.h |
| 5 | generic-y += trace_clock.h | 5 | generic-y += trace_clock.h |
| 6 | generic-y += preempt.h | ||