diff --git a/[refs] b/[refs]
index 209014835871..ab3f4a57a0ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 415f0a02adaea754dc85cde7b50707f7fbc4cf3f
+refs/heads/master: ecf1948985247cf35b5536fa62e02f56476f41f1
diff --git a/trunk/drivers/w1/w1.c b/trunk/drivers/w1/w1.c
index 9761950697b4..2f2e894ea0c8 100644
--- a/trunk/drivers/w1/w1.c
+++ b/trunk/drivers/w1/w1.c
@@ -1027,7 +1027,7 @@ static int __init w1_init(void)
 	retval = driver_register(&w1_slave_driver);
 	if (retval) {
 		printk(KERN_ERR
-			"Failed to register master driver. err=%d.\n",
+			"Failed to register slave driver. err=%d.\n",
 			retval);
 		goto err_out_master_unregister;
 	}