]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 729eb52 06d8308)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/linux...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Mar 2008 18:29:35 +0000 (11:29 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Mar 2008 18:29:35 +0000 (11:29 -0700)
* '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


Trivial merge
Linux 2.6 source tree