v2.6.35-rc4 patch
Subsystems (2)
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 <[email protected]> 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 <[email protected]>
Acked-by Wolfram Sang <[email protected]>
Signed-off-by Wim Van Sebroeck <[email protected]>
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.
================================================================================
Documentation/watchdog/watchdog-parameters.txt +5 -0
@@ -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)