]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'linus' into sched/new-API-sched_setscheduler
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