]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'sched/core'
authorIngo Molnar <mingo@kernel.org>
Wed, 31 Jul 2013 12:31:00 +0000 (14:31 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 31 Jul 2013 12:31:00 +0000 (14:31 +0200)
1  2 
kernel/sched/core.c
kernel/sched/fair.c

Simple merge
Simple merge