Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 18 Jan 2008 22:06:19 +0000 (14:06 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 18 Jan 2008 22:06:19 +0000 (14:06 -0800)
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] clarify watchdog operation in documentation
  [WATCHDOG] Revert "Stop looking for device as soon as one is found"


Trivial merge