Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[firefly-linux-kernel-4.4.55.git] / lib / kobject.c

diff --git a/lib/kobject.c b/lib/kobject.c
index f7f69cbe4f6e02c66a79e5d701442ca4761d8c0a..b0b26665c61161d4f33d1dbdaf49fe74275f400e 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -365,7 +365,7 @@ static int kobject_add_varg(struct kobject *kobj, struct kobject *parent,
  *
  * If @parent is set, then the parent of the @kobj will be set to it.
  * If @parent is NULL, then the parent of the @kobj will be set to the
- * kobject associted with the kset assigned to this kobject.  If no kset
+ * kobject associated with the kset assigned to this kobject.  If no kset
  * is assigned to the kobject, then the kobject will be located in the
  * root of the sysfs tree.
  *