Merge branch 'master' into for-next

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / block / blk-map.c

diff --git a/block/blk-map.c b/block/blk-map.c
index ae4ae10..cca6356 100644 (file)
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -285,7 +285,7 @@ EXPORT_SYMBOL(blk_rq_unmap_user);
  *
  * Description:
  *    Data will be mapped directly if possible. Otherwise a bounce
- *    buffer is used. Can be called multple times to append multple
+ *    buffer is used. Can be called multiple times to append multiple
  *    buffers.
  */
 int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,