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

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

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 32d36ec e9c84cb)

author	Ingo Molnar <mingo@kernel.org>
	Wed, 24 Oct 2012 08:32:50 +0000 (10:32 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Wed, 24 Oct 2012 08:32:50 +0000 (10:32 +0200)
commit	1fae429114619054181f201de869b15a6dba09ef
tree	2dc7b24c783ce0cc0e65c76c0757accab842971b	tree \| snapshot
parent	32d36ec723a7c36603e98b0dd30912bc78af6cc6	commit \| diff
parent	e9c84cb8d5f1b1ea6fcbe6190d51dc84b6975938	commit \| diff

Merge branch 'sched/core'

Conflicts:
kernel/sched/fair.c

include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/debug.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/sched.h	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules