Merge branch 'linus' into core/ipi

author Ingo Molnar <mingo@elte.hu>

Fri, 13 Mar 2009 01:14:25 +0000 (02:14 +0100)

committer Ingo Molnar <mingo@elte.hu>

Fri, 13 Mar 2009 01:14:25 +0000 (02:14 +0100)
author Ingo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 01:14:25 +0000 (02:14 +0100)
committer Ingo Molnar <mingo@elte.hu>
Fri, 13 Mar 2009 01:14:25 +0000 (02:14 +0100)
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/softirq.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Fri, 13 Mar 2009 01:14:25 +0000 (02:14 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Fri, 13 Mar 2009 01:14:25 +0000 (02:14 +0100)
		1	2
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/softirq.c	patch \|	diff1 \|	diff2 \|	blob \| history