Merge branch 'timers/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic...
authorIngo Molnar <mingo@kernel.org>
Wed, 10 Jul 2013 08:43:25 +0000 (10:43 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 10 Jul 2013 08:43:25 +0000 (10:43 +0200)
Pull nohz updates/fixes from Frederic Weisbecker:

' Note that "watchdog: Boot-disable by default on full dynticks" is a temporary
  solution to solve the issue with the watchdog that prevents the tick from
  stopping. This is to make sure that 3.11 doesn't have that problem as several
  people complained about it.

  A proper and longer term solution has been proposed by Peterz:

          http://lkml.kernel.org/r/20130618103632.GO3204@twins.programming.kicks-ass.net
'

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/sysctl.c
kernel/time/tick-sched.c

diff --cc kernel/sysctl.c
Simple merge
Simple merge