diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-02-04 10:58:52 -0500 |
| commit | f5bb3a5e9dcdb8435471562b6cada89525cf4df1 (patch) | |
| tree | 7b7cf9b90bacd0e2fe07cb3387516e9243f1ab66 /drivers/char/hangcheck-timer.c | |
| parent | 9853832c49dc1685587abeb4e1decd4be690d256 (diff) | |
| parent | 1560a79a2c2ea0c3826150da8029991d685de990 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (79 commits)
Jesper Juhl is the new trivial patches maintainer
Documentation: mention email-clients.txt in SubmittingPatches
fs/binfmt_elf.c: spello fix
do_invalidatepage() comment typo fix
Documentation/filesystems/porting fixes
typo fixes in net/core/net_namespace.c
typo fix in net/rfkill/rfkill.c
typo fixes in net/sctp/sm_statefuns.c
lib/: Spelling fixes
kernel/: Spelling fixes
include/scsi/: Spelling fixes
include/linux/: Spelling fixes
include/asm-m68knommu/: Spelling fixes
include/asm-frv/: Spelling fixes
fs/: Spelling fixes
drivers/watchdog/: Spelling fixes
drivers/video/: Spelling fixes
drivers/ssb/: Spelling fixes
drivers/serial/: Spelling fixes
drivers/scsi/: Spelling fixes
...
Diffstat (limited to 'drivers/char/hangcheck-timer.c')
| -rw-r--r-- | drivers/char/hangcheck-timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c index 0e8ceea5ea78..712d9f271aa6 100644 --- a/drivers/char/hangcheck-timer.c +++ b/drivers/char/hangcheck-timer.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | * The hangcheck-timer driver uses the TSC to catch delays that | 26 | * The hangcheck-timer driver uses the TSC to catch delays that |
| 27 | * jiffies does not notice. A timer is set. When the timer fires, it | 27 | * jiffies does not notice. A timer is set. When the timer fires, it |
| 28 | * checks whether it was delayed and if that delay exceeds a given | 28 | * checks whether it was delayed and if that delay exceeds a given |
| 29 | * margin of error. The hangcheck_tick module paramter takes the timer | 29 | * margin of error. The hangcheck_tick module parameter takes the timer |
| 30 | * duration in seconds. The hangcheck_margin parameter defines the | 30 | * duration in seconds. The hangcheck_margin parameter defines the |
| 31 | * margin of error, in seconds. The defaults are 60 seconds for the | 31 | * margin of error, in seconds. The defaults are 60 seconds for the |
| 32 | * timer and 180 seconds for the margin of error. IOW, a timer is set | 32 | * timer and 180 seconds for the margin of error. IOW, a timer is set |