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 /Documentation/watchdog | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'Documentation/watchdog')
| -rw-r--r-- | Documentation/watchdog/hpwdt.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/watchdog/hpwdt.txt b/Documentation/watchdog/hpwdt.txt index 9c24d5ffbb06..9488078900e0 100644 --- a/Documentation/watchdog/hpwdt.txt +++ b/Documentation/watchdog/hpwdt.txt | |||
| @@ -8,7 +8,7 @@ Last reviewed: 06/02/2009 | |||
| 8 | The HP iLO2 NMI Watchdog driver is a kernel module that provides basic | 8 | The HP iLO2 NMI Watchdog driver is a kernel module that provides basic |
| 9 | watchdog functionality and the added benefit of NMI sourcing. Both the | 9 | watchdog functionality and the added benefit of NMI sourcing. Both the |
| 10 | watchdog functionality and the NMI sourcing capability need to be enabled | 10 | watchdog functionality and the NMI sourcing capability need to be enabled |
| 11 | by the user. Remember that the two modes are not dependant on one another. | 11 | by the user. Remember that the two modes are not dependent on one another. |
| 12 | A user can have the NMI sourcing without the watchdog timer and vice-versa. | 12 | A user can have the NMI sourcing without the watchdog timer and vice-versa. |
| 13 | 13 | ||
| 14 | Watchdog functionality is enabled like any other common watchdog driver. That | 14 | Watchdog functionality is enabled like any other common watchdog driver. That |