diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 16:38:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-01 16:38:18 -0800 |
| commit | 1399ff54741b3aa0aaf5097b8559fa30277ebe61 (patch) | |
| tree | b384aef82007144b067cc171d2a9aa168b50b262 /include/linux/reiserfs_fs_sb.h | |
| parent | bb37b94c68e7b37eecea8576039ae9396ca07839 (diff) | |
| parent | 6b44d4e69c6144d0df71ab47ec90d2009237d48f (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
Fix typos in drivers/isdn/hisax/isdnl2.c
Fix typos in doc and comments
BUG_ON conversion for fs/aio.c
BUG_ON conversion for drivers/mmc/omap.c
BUG_ON conversion for drivers/media/video/pwc/pwc-if.c
Fix misc .c/.h comment typos
Fix misc Kconfig typos
Fix typos in /Documentation : Misc
Fix typos in /Documentation : 'U-Z'
Fix typos in /Documentation : 'T''
Fix jiffies.h comment
tabify MAINTAINERS
fix spelling error in include/linux/kernel.h
mqueue.h: don't include linux/types.h
Diffstat (limited to 'include/linux/reiserfs_fs_sb.h')
| -rw-r--r-- | include/linux/reiserfs_fs_sb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h index 73e0becec08..62a7169aed8 100644 --- a/include/linux/reiserfs_fs_sb.h +++ b/include/linux/reiserfs_fs_sb.h @@ -429,7 +429,7 @@ enum reiserfs_mount_options { /* -o hash={tea, rupasov, r5, detect} is meant for properly mounting ** reiserfs disks from 3.5.19 or earlier. 99% of the time, this option ** is not required. If the normal autodection code can't determine which -** hash to use (because both hases had the same value for a file) +** hash to use (because both hashes had the same value for a file) ** use this option to force a specific hash. It won't allow you to override ** the existing hash on the FS, so if you have a tea hash disk, and mount ** with -o hash=rupasov, the mount will fail. |