diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 19:23:38 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-02 19:23:38 -0400 |
| commit | 159d8133d0b54a501a41a66fe3a0e7d16405e36d (patch) | |
| tree | dd9b0204d90b25e1e0be933348776f09434333c6 /fs/buffer.c | |
| parent | 05bf58ca4b8f0be7d7af830f943f6d6b2c9ccee1 (diff) | |
| parent | c800bcd5f53fd9455fc6c68f1a34306e5aa4f79a (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
Pull trivial tree updates from Jiri Kosina:
"Usual rocket science -- mostly documentation and comment updates"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
sparse: fix comment
doc: fix double words
isdn: capi: fix "CAPI_VERSION" comment
doc: DocBook: Fix typos in xml and template file
Bluetooth: add module name for btwilink
driver core: unexport static function create_syslog_header
mmc: core: typo fix in printk specifier
ARM: spear: clean up editing mistake
net-sysfs: fix comment typo 'CONFIG_SYFS'
doc: Insert MODULE_ in module-signing macros
Documentation: update URL to hfsplus Technote 1150
gpio: update path to documentation
ixgbe: Fix format string in ixgbe_fcoe.
Kconfig: Remove useless "default N" lines
user_namespace.c: Remove duplicated word in comment
CREDITS: fix formatting
treewide: Fix typo in Documentation/DocBook
mm: Fix warning on make htmldocs caused by slab.c
ata: ata-samsung_cf: cleanup in header file
idr: remove unused prototype of idr_free()
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 27265a8b43c1..8c53a2b15ecb 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
| @@ -3088,7 +3088,7 @@ EXPORT_SYMBOL(submit_bh); | |||
| 3088 | * until the buffer gets unlocked). | 3088 | * until the buffer gets unlocked). |
| 3089 | * | 3089 | * |
| 3090 | * ll_rw_block sets b_end_io to simple completion handler that marks | 3090 | * ll_rw_block sets b_end_io to simple completion handler that marks |
| 3091 | * the buffer up-to-date (if approriate), unlocks the buffer and wakes | 3091 | * the buffer up-to-date (if appropriate), unlocks the buffer and wakes |
| 3092 | * any waiters. | 3092 | * any waiters. |
| 3093 | * | 3093 | * |
| 3094 | * All of the buffers must be for the same device, and must also be a | 3094 | * All of the buffers must be for the same device, and must also be a |
