Merge branch 'master' into for-next

[linux-2.6-block.git] / block / blk-core.c

diff --git a/block/blk-core.c b/block/blk-core.c
index 853f92749202cbfe5b252d557f667b7f970ac872..4db2b32b70e06182390b3396cfdafedf0f2ca4c9 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1929,7 +1929,7 @@ EXPORT_SYMBOL(submit_bio);
  *    in some cases below, so export this function.
  *    Request stacking drivers like request-based dm may change the queue
  *    limits while requests are in the queue (e.g. dm's table swapping).
- *    Such request stacking drivers should check those requests agaist
+ *    Such request stacking drivers should check those requests against
  *    the new queue limits again when they dispatch those requests,
  *    although such checkings are also done against the old queue limits
  *    when submitting requests.