diff --git a/[refs] b/[refs]
index 0ecd0909174c..8b41b51e1d0d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
---
-refs/heads/master: 6486abbf63a58af490144ecbc38375f655d328ad
+refs/heads/master: 936bb14ce9ecb3b17251f3589b59dd23419d2cb7
diff --git a/trunk/net/ipv4/Kconfig b/trunk/net/ipv4/Kconfig
index 503e7059e312..91f3a5cdbcf8 100644
--- a/trunk/net/ipv4/Kconfig
+++ b/trunk/net/ipv4/Kconfig
@@ -9,7 +9,7 @@ config IP_MULTICAST
intend to participate in the MBONE, a high bandwidth network on top
of the Internet which carries audio and video broadcasts. More
information about the MBONE is on the WWW at
- . Information about the multicast
+ . Information about the multicast
capabilities of the various network cards is contained in
. For most people, it's
safe to say N.