Merge branch 'linus' into core/softirq

author Ingo Molnar <mingo@elte.hu>

Mon, 23 Jun 2008 08:52:59 +0000 (10:52 +0200)

committer Ingo Molnar <mingo@elte.hu>

Mon, 23 Jun 2008 08:52:59 +0000 (10:52 +0200)
author Ingo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 08:52:59 +0000 (10:52 +0200)
committer Ingo Molnar <mingo@elte.hu>
Mon, 23 Jun 2008 08:52:59 +0000 (10:52 +0200)
diff --cc kernel/rcupreempt.c
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc net/core/dev.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 23 Jun 2008 08:52:59 +0000 (10:52 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 23 Jun 2008 08:52:59 +0000 (10:52 +0200)
		1	2
kernel/rcupreempt.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	patch \|	diff1 \|	diff2 \|	blob \| history