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) {