Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Apr 2008 23:11:22 +0000 (16:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 6 Apr 2008 23:11:22 +0000 (16:11 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] it8712f_wdt Zero MSB timeout byte when disabling watchdog


Trivial merge