Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...

[linux-2.6-omap-h63xx.git] / Documentation / nmi_watchdog.txt

diff --git a/Documentation/nmi_watchdog.txt b/Documentation/nmi_watchdog.txt
index 101bfcf19c0d8de8dd94b5d48702c55fbb84b156..90aa4531cb67343b03b396610aa0db77c1d1e0ba 100644 (file)
--- a/Documentation/nmi_watchdog.txt
+++ b/Documentation/nmi_watchdog.txt
@@ -69,7 +69,7 @@ to the overall system performance.
 On x86 nmi_watchdog is disabled by default so you have to enable it with
 a boot time parameter.
 
-NOTE: Prior to 2.4.2-ac18 the NMI-oopser is enabled unconditionally
+NOTE: In kernels prior to 2.4.2-ac18 the NMI-oopser is enabled unconditionally
 on x86 SMP boxes.
 
 [ feel free to send bug reports, suggestions and patches to