diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 02:06:53 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 02:06:53 +0100 |
commit | a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b (patch) | |
tree | 23b1109d5d286d1e96424f0195ed8c3144e04eb1 /fs | |
parent | [PATCH] rcu: don't set ->next_pending in rcu_start_batch() (diff) | |
parent | Small fixups to the EHCI Kconfig help text (diff) | |
download | linux-a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b.tar.xz linux-a457aa6c2bdd743bbbffd3f9e4fdbd8c71f8af1b.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'fs')
-rw-r--r-- | fs/9p/vfs_inode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c index d933ef1fbd8a..a17b28854288 100644 --- a/fs/9p/vfs_inode.c +++ b/fs/9p/vfs_inode.c @@ -663,7 +663,7 @@ v9fs_vfs_rename(struct inode *old_dir, struct dentry *old_dentry, } /** - * v9fs_vfs_getattr - retreive file metadata + * v9fs_vfs_getattr - retrieve file metadata * @mnt - mount information * @dentry - file to get attributes on * @stat - metadata structure to populate |