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)
commitd13536bef4b42d3e24f5ae2429722d008c60e3fc
tree07f45a2e4b178a4340e63dab6f04600cb1f27fa4
parent87b8d1adefa1548b591cbf0d63965987e2cf893d
parent3dae93ec3ee1fceec69f40ef9b97892ce62ba7a5
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