From 392f2c945c18ac27ba743cf98fcb5e2d8fd52ba5 Mon Sep 17 00:00:00 2001
From: Dmitry Artamonow <mad_soft@inbox.ru>
Date: Mon, 2 Apr 2012 09:42:22 +0400
Subject: [PATCH] --- yaml --- r: 305081 b: refs/heads/master c:
 a03abdcb8e537912c9c44f283747b995d1788d23 h: refs/heads/master i:   305079:
 364d43057400b0e269855e45356b54d249beb31e v: v3

---
 [refs]                | 2 +-
 trunk/drivers/w1/w1.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e451ff4c3bea..8bfe9654da6d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 409a3e98132c3a4f2aa2854995f8a9dd16cf11ac
+refs/heads/master: a03abdcb8e537912c9c44f283747b995d1788d23
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;
 	}