diff --git a/[refs] b/[refs]
index a9a50932b050..d9c663ca074e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afda335dc3872ca122842e26720ac6e6ef287aa2
+refs/heads/master: 1bb3a029078d437aa05bda8a8c8f8ecb1265e231
diff --git a/trunk/Documentation/nmi_watchdog.txt b/trunk/Documentation/nmi_watchdog.txt
index 101bfcf19c0d..90aa4531cb67 100644
--- a/trunk/Documentation/nmi_watchdog.txt
+++ b/trunk/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