diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-07-05 08:30:55 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-07-05 08:30:58 +0200 |
| commit | 08f8ba07998ab1b9efcdd3f28dadf6866a605ddb (patch) | |
| tree | 8e09855446f7b0312bb729d4b539090756e57927 /Documentation | |
| parent | 0879b100f3c187257729f36cba33d96ec2875766 (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
| download | linux-stable-08f8ba07998ab1b9efcdd3f28dadf6866a605ddb.tar.gz linux-stable-08f8ba07998ab1b9efcdd3f28dadf6866a605ddb.tar.bz2 linux-stable-08f8ba07998ab1b9efcdd3f28dadf6866a605ddb.zip | |
Merge commit 'v2.6.35-rc4' into perf/core
Merge reason: Pick up the latest perf fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/watchdog/watchdog-parameters.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/watchdog/watchdog-parameters.txt b/Documentation/watchdog/watchdog-parameters.txt index 41c95cc1dc1f..17ddd822b456 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) |