Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 3 Jun 2007 19:36:56 +0000 (12:36 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 3 Jun 2007 19:36:56 +0000 (12:36 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] clean-up watchdog documentation
  [WATCHDOG] ks8695_wdt.c - new KS8695 watchdog driver


Trivial merge