diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /fs/fat/dir.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'fs/fat/dir.c')
| -rw-r--r-- | fs/fat/dir.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fat/dir.c b/fs/fat/dir.c index db0de5c621c7..4095bc149eb1 100644 --- a/fs/fat/dir.c +++ b/fs/fat/dir.c | |||
| @@ -114,7 +114,7 @@ static inline int fat_get_entry(struct inode *dir, loff_t *pos, | |||
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | /* | 116 | /* |
| 117 | * Convert Unicode 16 to UTF8, translated Unicode, or ASCII. | 117 | * Convert Unicode 16 to UTF-8, translated Unicode, or ASCII. |
| 118 | * If uni_xlate is enabled and we can't get a 1:1 conversion, use a | 118 | * If uni_xlate is enabled and we can't get a 1:1 conversion, use a |
| 119 | * colon as an escape character since it is normally invalid on the vfat | 119 | * colon as an escape character since it is normally invalid on the vfat |
| 120 | * filesystem. The following four characters are the hexadecimal digits | 120 | * filesystem. The following four characters are the hexadecimal digits |