diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-04 18:31:02 -0400 |
commit | 3cfc2c42c1cbc8e238bb9c0612c0df4565e3a8b4 (patch) | |
tree | 5adc1ff2eaf64d450bf28bb6b2ce890db2567288 /fs/freevxfs | |
parent | 5cf65713f87775c548e3eb48dbafa32e12f28000 (diff) | |
parent | 0ea6e61122196509af82cc4f36cbdaacbefb8227 (diff) |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (48 commits)
Documentation: update broken web addresses.
fix comment typo "choosed" -> "chosen"
hostap:hostap_hw.c Fix typo in comment
Fix spelling contorller -> controller in comments
Kconfig.debug: FAIL_IO_TIMEOUT: typo Faul -> Fault
fs/Kconfig: Fix typo Userpace -> Userspace
Removing dead MACH_U300_BS26
drivers/infiniband: Remove unnecessary casts of private_data
fs/ocfs2: Remove unnecessary casts of private_data
libfc: use ARRAY_SIZE
scsi: bfa: use ARRAY_SIZE
drm: i915: use ARRAY_SIZE
drm: drm_edid: use ARRAY_SIZE
synclink: use ARRAY_SIZE
block: cciss: use ARRAY_SIZE
comment typo fixes: charater => character
fix comment typos concerning "challenge"
arm: plat-spear: fix typo in kerneldoc
reiserfs: typo comment fix
update email address
...
Diffstat (limited to 'fs/freevxfs')
-rw-r--r-- | fs/freevxfs/vxfs_super.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/freevxfs/vxfs_super.c b/fs/freevxfs/vxfs_super.c index 1e8af939b3e4..5132c99b1ca2 100644 --- a/fs/freevxfs/vxfs_super.c +++ b/fs/freevxfs/vxfs_super.c | |||
@@ -135,7 +135,7 @@ static int vxfs_remount(struct super_block *sb, int *flags, char *data) | |||
135 | } | 135 | } |
136 | 136 | ||
137 | /** | 137 | /** |
138 | * vxfs_read_super - read superblock into memory and initalize filesystem | 138 | * vxfs_read_super - read superblock into memory and initialize filesystem |
139 | * @sbp: VFS superblock (to fill) | 139 | * @sbp: VFS superblock (to fill) |
140 | * @dp: fs private mount data | 140 | * @dp: fs private mount data |
141 | * @silent: do not complain loudly when sth is wrong | 141 | * @silent: do not complain loudly when sth is wrong |