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/acquirewdt.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/acquirewdt.c')
| -rw-r--r-- | drivers/watchdog/acquirewdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/acquirewdt.c b/drivers/watchdog/acquirewdt.c index 2ffce4d75443..b6a2b58cbe64 100644 --- a/drivers/watchdog/acquirewdt.c +++ b/drivers/watchdog/acquirewdt.c | |||
| @@ -26,7 +26,7 @@ | |||
| 26 | * Theory of Operation: | 26 | * Theory of Operation: |
| 27 | * The Watch-Dog Timer is provided to ensure that standalone | 27 | * The Watch-Dog Timer is provided to ensure that standalone |
| 28 | * Systems can always recover from catastrophic conditions that | 28 | * Systems can always recover from catastrophic conditions that |
| 29 | * caused the CPU to crash. This condition may have occured by | 29 | * caused the CPU to crash. This condition may have occurred by |
| 30 | * external EMI or a software bug. When the CPU stops working | 30 | * external EMI or a software bug. When the CPU stops working |
| 31 | * correctly, hardware on the board will either perform a hardware | 31 | * correctly, hardware on the board will either perform a hardware |
| 32 | * reset (cold boot) or a non-maskable interrupt (NMI) to bring the | 32 | * reset (cold boot) or a non-maskable interrupt (NMI) to bring the |