diff --git a/[refs] b/[refs]
index 178d72316824..4952f7690eef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff9517a68792bb363c16f4e3155c4fc5a7f9d738
+refs/heads/master: 5227bbb008fa6d2efddd86170bdfac2020cf571d
diff --git a/trunk/net/dns_resolver/Kconfig b/trunk/net/dns_resolver/Kconfig
index 2ec47cb5d0d6..50d49f7e0472 100644
--- a/trunk/net/dns_resolver/Kconfig
+++ b/trunk/net/dns_resolver/Kconfig
@@ -15,7 +15,7 @@ config DNS_RESOLVER
 	  cell's volume location database servers.
 
 	  DNS Resolver is used by the CIFS and AFS modules, and would support
-	  samba4 later.  DNS Resolver is supported by the userspace upcall
+	  SMB2 later.  DNS Resolver is supported by the userspace upcall
 	  helper "/sbin/dns.resolver" via /etc/request-key.conf.
 
 	  See <file:Documentation/networking/dns_resolver.txt> for further