Prev: perf_events: Add a helper to search for an event in a context
Next: [GIT PULL net-2.6] vhost-net: more error handling fixes
From: Wim Van Sebroeck on 1 Jul 2010 12:30
Hi Linus,

Please pull from 'master' branch of
git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git
or if master.kernel.org hasn't synced up yet:
master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git

This will update the following files:

Documentation/watchdog/watchdog-parameters.txt | 5 +++++
1 file changed, 5 insertions(+)

with these Changes:

Author: Fabio Estevam <fabio.estevam(a)freescale.com>
Date: Thu Jun 24 09:43:25 2010 -0700

watchdog: docs: add an entry for imx2_wdt

Add an entry for imx2_wdt in watchdog-parameters.txt

Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com>
Acked-by: Wolfram Sang <w.sang(a)pengutronix.de>
Signed-off-by: Wim Van Sebroeck <wim(a)iguana.be>

The Changes can also be looked at on:
http://www.kernel.org/git/?p=linux/kernel/git/wim/linux-2.6-watchdog.git;a=summary

For completeness, I added the overal diff below.

Greetings,
Wim.

================================================================================
diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt
index 41c95cc..17ddd82 100644
--- a/Documentation/watchdog/watchdog-parameters.txt
+++ b/Documentation/watchdog/watchdog-parameters.txt
@@ -125,6 +125,11 @@ ibmasr:
nowayout: Watchdog cannot be stopped once started
(default=kernel config parameter)
-------------------------------------------------
+imx2_wdt:
+timeout: Watchdog timeout in seconds (default 60 s)
+nowayout: Watchdog cannot be stopped once started
+ (default=kernel config parameter)
+-------------------------------------------------
indydog:
nowayout: Watchdog cannot be stopped once started
(default=kernel config parameter)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: perf_events: Add a helper to search for an event in a context
Next: [GIT PULL net-2.6] vhost-net: more error handling fixes