tree 07f45a2e4b178a4340e63dab6f04600cb1f27fa4
parent 87b8d1adefa1548b591cbf0d63965987e2cf893d
parent 3dae93ec3ee1fceec69f40ef9b97892ce62ba7a5
author Linus Torvalds <torvalds@linux-foundation.org> 1266780347 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1266780347 -0800

Merge git://git.kernel.org/pub/scm/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