Merge branch 'linus' into core/softirq

author Ingo Molnar <mingo@elte.hu>

Mon, 16 Jun 2008 09:24:17 +0000 (11:24 +0200)

committer Ingo Molnar <mingo@elte.hu>

Mon, 16 Jun 2008 09:24:17 +0000 (11:24 +0200)
author Ingo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:24:17 +0000 (11:24 +0200)
committer Ingo Molnar <mingo@elte.hu>
Mon, 16 Jun 2008 09:24:17 +0000 (11:24 +0200)
diff --cc block/blk-core.c
Simple merge
diff --cc kernel/sched.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 16 Jun 2008 09:24:17 +0000 (11:24 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 16 Jun 2008 09:24:17 +0000 (11:24 +0200)
		1	2
block/blk-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history