]> err.no Git - linux-2.6/commitdiff
Merge branch 'sched/for-linus' into tracing/for-linus
authorIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 14:11:02 +0000 (16:11 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Jul 2008 14:11:02 +0000 (16:11 +0200)
1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge