Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
commitc28cf0fdcd38e912fa72258d78cb213b716247d6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Apr 2008 23:11:22 +0000 (6 16:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Apr 2008 23:11:22 +0000 (6 16:11 -0700)
tree105f87dc9fb41662a723c167b92c04cb4804adea
parent64ba4f230d30b089bc89db2e59d02c1efa5ac769
parentcc1020f15ad0f843c0111bf4b77bdfaabca79571
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] it8712f_wdt Zero MSB timeout byte when disabling watchdog