From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Mar 2008 18:29:35 +0000 (-0700)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux... 
X-Git-Tag: v2.6.25-rc8~84
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8f404faa72f4e458e7bd81ac75ce55ae829e953d;p=linux-2.6

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux-2.6-hrt:
  NOHZ: reevaluate idle sleep length after add_timer_on()
  clocksource: revert: use init_timer_deferrable for clocksource_watchdog
---

8f404faa72f4e458e7bd81ac75ce55ae829e953d