Merge branch 'master' into for-next

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / fs / buffer.c

diff --git a/fs/buffer.c b/fs/buffer.c
index 27265a8..8c53a2b 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -3088,7 +3088,7 @@ EXPORT_SYMBOL(submit_bh);
  * until the buffer gets unlocked).
  *
  * ll_rw_block sets b_end_io to simple completion handler that marks
- * the buffer up-to-date (if approriate), unlocks the buffer and wakes
+ * the buffer up-to-date (if appropriate), unlocks the buffer and wakes
  * any waiters. 
  *
  * All of the buffers must be for the same device, and must also be a