From: Linus Torvalds Date: Sun, 21 Feb 2010 19:25:47 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog X-Git-Tag: firefly_0821_release~9833^2~3140 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d13536bef4b42d3e24f5ae2429722d008c60e3fc;p=firefly-linux-kernel-4.4.55.git Merge git://git./linux/kernel/git/wim/linux-2.6-watchdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [WATCHDOG] bfin: fix max timeout calculation --- d13536bef4b42d3e24f5ae2429722d008c60e3fc