]> err.no Git - linux-2.6/commitdiff
Merge branch 'linus' into core/softirq
authorIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:23:59 +0000 (12:23 +0200)
committerIngo Molnar <mingo@elte.hu>
Wed, 25 Jun 2008 10:23:59 +0000 (12:23 +0200)
1  2 
kernel/sched.c

diff --cc kernel/sched.c
Simple merge