]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
Merge branch 'linus' into sched/new-API-sched_setscheduler tip-sched-new-API-sched_setscheduler-2008-06-25_10.27_Wed
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:27:05 +0000 (12:27 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:27:05 +0000 (12:27 +0200)
1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge