Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...

author Ingo Molnar <mingo@kernel.org>

Sat, 25 Jan 2014 07:27:26 +0000 (08:27 +0100)

committer Ingo Molnar <mingo@kernel.org>

Sat, 25 Jan 2014 07:27:26 +0000 (08:27 +0100)
author Ingo Molnar <mingo@kernel.org>
Sat, 25 Jan 2014 07:27:26 +0000 (08:27 +0100)
committer Ingo Molnar <mingo@kernel.org>
Sat, 25 Jan 2014 07:27:26 +0000 (08:27 +0100)
diff --cc kernel/sched/core.c
Simple merge
diff --cc kernel/softirq.c
Simple merge
diff --cc kernel/time/tick-sched.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Sat, 25 Jan 2014 07:27:26 +0000 (08:27 +0100)
committer	Ingo Molnar <mingo@kernel.org>
	Sat, 25 Jan 2014 07:27:26 +0000 (08:27 +0100)
		1	2
kernel/sched/core.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/softirq.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/time/tick-sched.c	patch \|	diff1 \|	diff2 \|	blob \| history