diff --git a/[refs] b/[refs] index 6e7f19b0fa6b..a8028d08defb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4623236619ff5ce233136d13ee2747c194a63591 +refs/heads/master: acccafe9ca63eac3a202d8805d286ada6ab8cced diff --git a/trunk/Documentation/kobject.txt b/trunk/Documentation/kobject.txt index bf3256e04027..51a8021ee532 100644 --- a/trunk/Documentation/kobject.txt +++ b/trunk/Documentation/kobject.txt @@ -305,7 +305,7 @@ should not be manipulated by any other user. A kset keeps its children in a standard kernel linked list. Kobjects point back to their containing kset via their kset field. In almost all cases, -the kobjects belonging to a ket have that kset (or, strictly, its embedded +the kobjects belonging to a kset have that kset (or, strictly, its embedded kobject) in their parent. As a kset contains a kobject within it, it should always be dynamically