diff --git a/[refs] b/[refs]
index a82a52234483..d78ffe567b99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ce16c5337ab0d165f95c88aa857207efd7c01139
+refs/heads/master: bf869c30628cc02295fb919f0d0074f296d5f129
diff --git a/trunk/Documentation/networking/ip-sysctl.txt b/trunk/Documentation/networking/ip-sysctl.txt
index 71041c21af9b..e0b8c2c61710 100644
--- a/trunk/Documentation/networking/ip-sysctl.txt
+++ b/trunk/Documentation/networking/ip-sysctl.txt
@@ -711,8 +711,8 @@ rp_filter - INTEGER
 	    the packet check will fail.
 
         Current recommended practice in RFC3704 is to enable strict mode
-	to prevent IP spoofin from DDos attacks. If using asymmetric routing
-        or other complicated routing,t hen loose mode is recommended.
+	to prevent IP spoofing from DDos attacks. If using asymmetric routing
+        or other complicated routing, then loose mode is recommended.
 
 	conf/all/rp_filter must also be set to non-zero to do source validation
 	on the interface