aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-06-11 17:29:06 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-06-11 17:29:06 -0700
commitaaef4d6c2ee64d5e4d59b7c4d23c37ce59115211 (patch)
treeb8fbada3f36c0625e0f52a2e120ac97a1b00ce09 /Documentation
parentda50ccc6a0f32ad29c1168837330a78e6e2e2923 (diff)
parentacccafe9ca63eac3a202d8805d286ada6ab8cced (diff)
downloadlinux-linaro-aaef4d6c2ee64d5e4d59b7c4d23c37ce59115211.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: kobject: Documentation Spelling Patch dev_set_name: fix missing kernel-doc
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kobject.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt
index bf3256e0402..51a8021ee53 100644
--- a/Documentation/kobject.txt
+++ b/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