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)
commit7dfb1716d717e41c07410bab52760d865caee12b
treed5e62713d8712af8c9b356ce402a4fa9526a6cae
parent20c4856b1d1939647f71dce5e54fe69fde80013f
parent4d389dcea8543161c3bb1e26f1c2ffb7e0822ff1
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] clean-up watchdog documentation
  [WATCHDOG] ks8695_wdt.c - new KS8695 watchdog driver