mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* [WATCHDOG] v2.6.35-rc4 patch
@ 2010-07-01 16:07 Wim Van Sebroeck
  0 siblings, 0 replies; only message in thread
From: Wim Van Sebroeck @ 2010-07-01 16:07 UTC (permalink / raw)
  To: Linus Torvalds; +Cc: Andrew Morton, LKML, Fabio Estevam

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@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@freescale.com>
    Acked-by: Wolfram Sang <w.sang@pengutronix.de>
    Signed-off-by: Wim Van Sebroeck <wim@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)

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-07-01 16:28 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-07-01 16:07 [WATCHDOG] v2.6.35-rc4 patch Wim Van Sebroeck

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®