commit | 8f404faa72f4e458e7bd81ac75ce55ae829e953d | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 26 11:29:35 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Mar 26 11:29:35 2008 -0700 |
tree | 46b70d6d86fc619343b4986160bda5e46b86bb18 | |
parent | 729eb528c7e10a4828fece102872ec5255946f64 [diff] | |
parent | 06d8308c61e54346585b2691c13ee3f90cb6fb2f [diff] |
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