Merge branch 'sched/urgent'

author Ingo Molnar <mingo@kernel.org>

Tue, 13 Nov 2012 13:21:56 +0000 (14:21 +0100)

committer Ingo Molnar <mingo@kernel.org>

Tue, 13 Nov 2012 13:21:56 +0000 (14:21 +0100)
author Ingo Molnar <mingo@kernel.org>
Tue, 13 Nov 2012 13:21:56 +0000 (14:21 +0100)
committer Ingo Molnar <mingo@kernel.org>
Tue, 13 Nov 2012 13:21:56 +0000 (14:21 +0100)
diff --cc fs/proc/base.c
Simple merge
diff --cc kernel/sched/fair.c
Simple merge
diff --cc kernel/sysctl.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Tue, 13 Nov 2012 13:21:56 +0000 (14:21 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 13 Nov 2012 13:21:56 +0000 (14:21 +0100)
		1	2
fs/proc/base.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/sysctl.c	patch \|	diff1 \|	diff2 \|	blob \| history