diff --git a/[refs] b/[refs] index 30374ae1400c..8a57491822a2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78c6146f16d45f52c33ddb6b48c10fc6cfc53659 +refs/heads/master: 5b3f129c5592ca35b3fe8916767c58b98710478c diff --git a/trunk/net/ipv6/Kconfig b/trunk/net/ipv6/Kconfig index 42814a2ec9d7..b2c9becc02e8 100644 --- a/trunk/net/ipv6/Kconfig +++ b/trunk/net/ipv6/Kconfig @@ -167,7 +167,7 @@ config IPV6_SIT Tunneling means encapsulating data of one protocol type within another protocol and sending it over a channel that understands the encapsulating protocol. This driver implements encapsulation of IPv6 - into IPv4 packets. This is useful if you want to connect two IPv6 + into IPv4 packets. This is useful if you want to connect to IPv6 networks over an IPv4-only path. Saying M here will produce a module called sit.ko. If unsure, say Y.