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)
commitc9daa2722a3f1967e3e9750fd4cb6a7352a3cd63
treea28c40b8e4f8ee1d653d5add903e03a9be0ede8a
parent977c8fa4d75d4ebe7ebbe116eed9e06f780fb34d
parent0d710cba3afde2109030254ee90654fbb580e8af
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] clarify watchdog operation in documentation
  [WATCHDOG] Revert "Stop looking for device as soon as one is found"