Merge branch 'linus' into core/ipi
authorIngo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 01:14:25 +0000 (02:14 +0100)
committerIngo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 01:14:25 +0000 (02:14 +0100)
1  2 
kernel/sched.c
kernel/softirq.c

diff --cc kernel/sched.c
Simple merge
Simple merge