diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 16:41:09 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 16:41:09 (GMT) |
| commit | 1e8c573933fd7975679766850252ad08667e5ca4 (patch) | |
| tree | 9600d0c7ee5ea8925f3c4dc30680c819e0363805 /fs/befs/datastream.c | |
| parent | d71eecf3b8e893757cc3dec560c96a32ac090890 (diff) | |
| parent | 232443e2c90cc2930624dec89df327615b002c55 (diff) | |
| download | linux-fsl-qoriq-1e8c573933fd7975679766850252ad08667e5ca4.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (21 commits)
BUG_ON() Conversion in drivers/video/
BUG_ON() Conversion in drivers/parisc/
BUG_ON() Conversion in drivers/block/
BUG_ON() Conversion in sound/sparc/cs4231.c
BUG_ON() Conversion in drivers/s390/block/dasd.c
BUG_ON() Conversion in lib/swiotlb.c
BUG_ON() Conversion in kernel/cpu.c
BUG_ON() Conversion in ipc/msg.c
BUG_ON() Conversion in block/elevator.c
BUG_ON() Conversion in fs/coda/
BUG_ON() Conversion in fs/binfmt_elf_fdpic.c
BUG_ON() Conversion in input/serio/hil_mlc.c
BUG_ON() Conversion in md/dm-hw-handler.c
BUG_ON() Conversion in md/bitmap.c
The comment describing how MS_ASYNC works in msync.c is confusing
rcu: undeclared variable used in documentation
fix typos "wich" -> "which"
typo patch for fs/ufs/super.c
Fix simple typos
tabify drivers/char/Makefile
...
Diffstat (limited to 'fs/befs/datastream.c')
| -rw-r--r-- | fs/befs/datastream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/befs/datastream.c b/fs/befs/datastream.c index 785f6b2..b7d6b92 100644 --- a/fs/befs/datastream.c +++ b/fs/befs/datastream.c @@ -118,7 +118,7 @@ befs_fblock2brun(struct super_block *sb, befs_data_stream * data, * befs_read_lsmylink - read long symlink from datastream. * @sb: Filesystem superblock * @ds: Datastrem to read from - * @buf: Buffer in wich to place long symlink data + * @buf: Buffer in which to place long symlink data * @len: Length of the long symlink in bytes * * Returns the number of bytes read |