diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-11 20:29:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-11 20:29:06 -0400 |
| commit | aaef4d6c2ee64d5e4d59b7c4d23c37ce59115211 (patch) | |
| tree | b8fbada3f36c0625e0f52a2e120ac97a1b00ce09 /Documentation | |
| parent | da50ccc6a0f32ad29c1168837330a78e6e2e2923 (diff) | |
| parent | acccafe9ca63eac3a202d8805d286ada6ab8cced (diff) | |
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.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kobject.txt b/Documentation/kobject.txt index bf3256e04027..51a8021ee532 100644 --- a/Documentation/kobject.txt +++ b/Documentation/kobject.txt | |||
| @@ -305,7 +305,7 @@ should not be manipulated by any other user. | |||
| 305 | 305 | ||
| 306 | A kset keeps its children in a standard kernel linked list. Kobjects point | 306 | A kset keeps its children in a standard kernel linked list. Kobjects point |
| 307 | back to their containing kset via their kset field. In almost all cases, | 307 | back to their containing kset via their kset field. In almost all cases, |
| 308 | the kobjects belonging to a ket have that kset (or, strictly, its embedded | 308 | the kobjects belonging to a kset have that kset (or, strictly, its embedded |
| 309 | kobject) in their parent. | 309 | kobject) in their parent. |
| 310 | 310 | ||
| 311 | As a kset contains a kobject within it, it should always be dynamically | 311 | As a kset contains a kobject within it, it should always be dynamically |