diff --git a/[refs] b/[refs] index c60ad2458e63..d1c6179626ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9cba632e24ef18e2905c18997a8f24e8d7a29e71 +refs/heads/master: 7d120c55df02a2b87f4aa317f1f04e398398dcdc diff --git a/trunk/net/ipv6/ip6mr.c b/trunk/net/ipv6/ip6mr.c index bf268b386963..0b11b378d89a 100644 --- a/trunk/net/ipv6/ip6mr.c +++ b/trunk/net/ipv6/ip6mr.c @@ -1240,7 +1240,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, int #endif /* - * Spurious command, or MRT_VERSION which you cannot + * Spurious command, or MRT6_VERSION which you cannot * set. */ default: