]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'sched/urgent' into auto-latest
authorIngo Molnar <mingo@elte.hu>
Mon, 26 Sep 2011 13:08:51 +0000 (15:08 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 26 Sep 2011 13:08:51 +0000 (15:08 +0200)
1  2 
kernel/sched.c
kernel/sched_rt.c

diff --cc kernel/sched.c
Simple merge
Simple merge