From: Linus Torvalds Date: Sat, 13 Mar 2010 00:27:08 +0000 (-0800) Subject: Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... X-Git-Tag: firefly_0821_release~9833^2~2603 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=64d5aea30062ce9f3ce7c62be8ae65e776cbfee2;p=firefly-linux-kernel-4.4.55.git Merge branch 'timers-fixes-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip * 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: timekeeping: Prevent oops when GENERIC_TIME=n --- 64d5aea30062ce9f3ce7c62be8ae65e776cbfee2