diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/watchdog/sbc8360.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/watchdog/sbc8360.c')
| -rw-r--r-- | drivers/watchdog/sbc8360.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/sbc8360.c b/drivers/watchdog/sbc8360.c index 68e2e2d6f73d..514ec23050f7 100644 --- a/drivers/watchdog/sbc8360.c +++ b/drivers/watchdog/sbc8360.c | |||
| @@ -114,7 +114,7 @@ static char expect_close; | |||
| 114 | * C | 6.5s 65s 650s 1300s | 114 | * C | 6.5s 65s 650s 1300s |
| 115 | * D | 7s 70s 700s 1400s | 115 | * D | 7s 70s 700s 1400s |
| 116 | * E | 7.5s 75s 750s 1500s | 116 | * E | 7.5s 75s 750s 1500s |
| 117 | * F | 8s 80s 800s 1600s | 117 | * F | 8s 80s 800s 1600s |
| 118 | * | 118 | * |
| 119 | * Another way to say the same things is: | 119 | * Another way to say the same things is: |
| 120 | * For N=1, Timeout = (M+1) * 0.5s | 120 | * For N=1, Timeout = (M+1) * 0.5s |