Merge branch 'timers/fast-wheel' into timers/core

author Ingo Molnar <mingo@kernel.org>

Thu, 7 Jul 2016 08:35:28 +0000 (10:35 +0200)

committer Ingo Molnar <mingo@kernel.org>

Thu, 7 Jul 2016 08:35:28 +0000 (10:35 +0200)
author Ingo Molnar <mingo@kernel.org>
Thu, 7 Jul 2016 08:35:28 +0000 (10:35 +0200)
committer Ingo Molnar <mingo@kernel.org>
Thu, 7 Jul 2016 08:35:28 +0000 (10:35 +0200)
diff --cc kernel/time/tick-sched.c
Simple merge
diff --cc kernel/time/timer.c
Simple merge
author	Ingo Molnar <mingo@kernel.org>
	Thu, 7 Jul 2016 08:35:28 +0000 (10:35 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Thu, 7 Jul 2016 08:35:28 +0000 (10:35 +0200)
		1	2
kernel/time/tick-sched.c	patch \|	diff1 \|	diff2 \|	blob \| history
kernel/time/timer.c	patch \|	diff1 \|	diff2 \|	blob \| history