Merge branch 'core/locking' into core/urgent

author Ingo Molnar <mingo@elte.hu>

Mon, 11 Aug 2008 22:11:49 +0000 (00:11 +0200)

committer Ingo Molnar <mingo@elte.hu>

Mon, 11 Aug 2008 22:11:49 +0000 (00:11 +0200)
author Ingo Molnar <mingo@elte.hu>
Mon, 11 Aug 2008 22:11:49 +0000 (00:11 +0200)
committer Ingo Molnar <mingo@elte.hu>
Mon, 11 Aug 2008 22:11:49 +0000 (00:11 +0200)
diff --cc kernel/sched.c
Simple merge
diff --cc kernel/workqueue.c
Simple merge
diff --cc mm/mmap.c
Simple merge
author	Ingo Molnar <mingo@elte.hu>
	Mon, 11 Aug 2008 22:11:49 +0000 (00:11 +0200)
committer	Ingo Molnar <mingo@elte.hu>
	Mon, 11 Aug 2008 22:11:49 +0000 (00:11 +0200)
		1	2
kernel/sched.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/workqueue.c	patch \|	diff1 \|	diff2 \|	blob \| history
mm/mmap.c	patch \|	diff1 \|	diff2 \|	blob \| history