Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Feb 2010 19:25:47 +0000 (11:25 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 21 Feb 2010 19:25:47 +0000 (11:25 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] bfin: fix max timeout calculation


Trivial merge