]> err.no Git - linux-2.6/commitdiff
Merge branch 'linus' into sched/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:00:26 +0000 (11:00 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 09:00:26 +0000 (11:00 +0200)
1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge