Merge http://linux-watchdog.bkbits.net/linux-2.5-watchdog

into home.osdl.org:/home/torvalds/v2.5/linux

Merge http://linux-watchdog.bkbits.net/linux-2.5-watchdog
into home.osdl.org:/home/torvalds/v2.5/linux
c4b8b77d · Linus Torvalds · dfc0c2b8 · 9683843a · c4b8b77d · c4b8b77d
Commit c4b8b77d authored Sep 06, 2003 by Linus Torvalds
3 changed files
--- a/Documentation/pcwd-watchdog.txt
+++ b/Documentation/pcwd-watchdog.txt
--- a/Documentation/watchdog-api.txt
+++ b/Documentation/watchdog-api.txt
--- a/Documentation/watchdog.txt
+++ b/Documentation/watchdog.txt