]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c13dc31 a22c4d7)
Merge branch 'linus' into core/rcu, to fix up a semantic conflict
authorIngo Molnar <mingo@kernel.org>
Wed, 28 Oct 2015 12:17:01 +0000 (13:17 +0100)
committerIngo Molnar <mingo@kernel.org>
Wed, 28 Oct 2015 12:17:20 +0000 (13:17 +0100)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/sched/core.c patch | diff1 | diff2 | blob | history

diff --cc kernel/sched/core.c
Simple merge
Linux kernel for KaRo TX COM modules