Merge branch 'linus' into core/softirq
authorIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 08:52:59 +0000 (10:52 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 08:52:59 +0000 (10:52 +0200)
1  2 
kernel/rcupreempt.c
kernel/sched.c
net/core/dev.c

Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc net/core/dev.c
Simple merge