Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2

This commit is contained in:
Linus Torvalds 2006-02-03 15:21:40 -08:00
commit d1ffa5669c
30 changed files with 507 additions and 158 deletions

View file

@ -126,7 +126,7 @@ extern struct config_item *config_group_find_obj(struct config_group *, const ch
struct configfs_attribute {
char *ca_name;
const char *ca_name;
struct module *ca_owner;
mode_t ca_mode;
};