From 62ca5b351de8183b47e0597fc20cb36435cd97f5 Mon Sep 17 00:00:00 2001
From: Peter Korsgaard <jacmet@sunsite.dk>
Date: Tue, 17 Apr 2012 12:12:57 +0200
Subject: [PATCH] --- yaml --- r: 304031 b: refs/heads/master c:
 0d4e293ca8271cc7d7ac1423afe5ceb7d213d0fc h: refs/heads/master i:   304029:
 6c5d64d9056c312744d135a7b2ad97a439c020a1   304027:
 cca34b3eefc10311f948ed7cf7bbb4bd9d10879c   304023:
 fedf710a10b0d37449056296664d9c06d03151a7   304015:
 1e4ac722eee49a22ba799dd65882330276a7a6d1   303999:
 fb42631da2f1238bb981b5dabf68a2340dc265a9 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/base/core.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index be9a6f7a9379..eab7dce35215 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02fbe5e61df654b2b39a1ddc1ae912c9e14c3ddd
+refs/heads/master: 0d4e293ca8271cc7d7ac1423afe5ceb7d213d0fc
diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c
index e28ce9898af4..6cb25f1511df 100644
--- a/trunk/drivers/base/core.c
+++ b/trunk/drivers/base/core.c
@@ -878,8 +878,8 @@ EXPORT_SYMBOL_GPL(dev_set_name);
  * to NULL prevents an entry from being created.  class->dev_kobj must
  * be set (or cleared) before any devices are registered to the class
  * otherwise device_create_sys_dev_entry() and
- * device_remove_sys_dev_entry() will disagree about the the presence
- * of the link.
+ * device_remove_sys_dev_entry() will disagree about the presence of
+ * the link.
  */
 static struct kobject *device_to_dev_kobj(struct device *dev)
 {