tree edcd90e3134a5409339794f43d5dd4453cd72586
parent 7c6809ff2bd63d4c97ce9e0b94d39d5180842c48
parent 5b8621a68fdcd2baf1d3b413726f913a5254d46a
author Ingo Molnar <mingo@kernel.org> 1373445805 +0200
committer Ingo Molnar <mingo@kernel.org> 1373445805 +0200

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

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>