From: Linus Torvalds 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: firefly_0821_release~21862 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8f404faa72f4e458e7bd81ac75ce55ae829e953d;p=firefly-linux-kernel-4.4.55.git Merge branch 'master' of git://git./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