diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-29 00:11:28 +0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-07-29 00:11:28 +0400 |
commit | 7d50d07da23995a18ac449636cb42aec2cb2808d (patch) | |
tree | 0ddf940a5e9ddc5eeebc996601d7fee3c36ab836 /fs/jffs2/xattr.c | |
parent | 2decb194e65ab66eaf787512dc572cdc99893b24 (diff) | |
parent | 6aa033d7efb85830535bb83cf6713d6025ae6e59 (diff) | |
download | linux-7d50d07da23995a18ac449636cb42aec2cb2808d.tar.xz |
Merge remote branch 'linus/master' into x86/cpu
Diffstat (limited to 'fs/jffs2/xattr.c')
-rw-r--r-- | fs/jffs2/xattr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/jffs2/xattr.c b/fs/jffs2/xattr.c index a2d58c96f1b4..d258e261bdc7 100644 --- a/fs/jffs2/xattr.c +++ b/fs/jffs2/xattr.c @@ -626,7 +626,7 @@ void jffs2_xattr_free_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *i static int check_xattr_ref_inode(struct jffs2_sb_info *c, struct jffs2_inode_cache *ic) { - /* success of check_xattr_ref_inode() means taht inode (ic) dose not have + /* success of check_xattr_ref_inode() means that inode (ic) dose not have * duplicate name/value pairs. If duplicate name/value pair would be found, * one will be removed. */ |