git.kernelconcepts.de Git - karo-tx-linux.git/commit

]> git.kernelconcepts.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: c13dc31 a22c4d7)

author	Ingo Molnar <mingo@kernel.org>
	Wed, 28 Oct 2015 12:17:01 +0000 (13:17 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Wed, 28 Oct 2015 12:17:20 +0000 (13:17 +0100)
commit	e4340bbb07dd38339c0773543dd928886e512a57
tree	f38d9d2f929037325362328415b2a1e7bfe52a15	tree \| snapshot
parent	c13dc31adb04c3f85d54d2fa13e34206f25742eb	commit \| diff
parent	a22c4d7e34402ccdf3414f64c50365436eba7b93	commit \| diff

Merge branch 'linus' into core/rcu, to fix up a semantic conflict

Signed-off-by: Ingo Molnar <mingo@kernel.org>

kernel/sched/core.c

Linux kernel for KaRo TX COM modules