]> err.no Git - linux-2.6/commitdiff
Merge branch 'sched/cpuset' into sched/urgent
authorIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 19:03:16 +0000 (21:03 +0200)
committerIngo Molnar <mingo@elte.hu>
Sat, 6 Sep 2008 19:03:16 +0000 (21:03 +0200)
1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge