diff --git a/[refs] b/[refs] index 2fdce1d21331..f003e3480201 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ca8a3c1b17cde8241eb9157484519427fa5bf91 +refs/heads/master: e9539ee73a9b85bdc6eab9e15dd1ee639a815406 diff --git a/trunk/Documentation/kobject.txt b/trunk/Documentation/kobject.txt index 8d9bffbd192c..949f7b5a2053 100644 --- a/trunk/Documentation/kobject.txt +++ b/trunk/Documentation/kobject.txt @@ -247,7 +247,7 @@ the object-specific fields, which include: - default_attrs: Default attributes to be exported via sysfs when the object is registered.Note that the last attribute has to be initialized to NULL ! You can find a complete implementation - in drivers/block/genhd.c + in block/genhd.c Instances of struct kobj_type are not registered; only referenced by