]> err.no Git - linux-2.6/commitdiff
Merge branch 'linus' into sched/devel
authorIngo Molnar <mingo@elte.hu>
Sun, 13 Jul 2008 06:50:13 +0000 (08:50 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 13 Jul 2008 06:50:13 +0000 (08:50 +0200)
1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge