Merge branch 'master' of /repos/git/net-next-2.6

[~andy/linux] / block / blk-exec.c

diff --git a/block/blk-exec.c b/block/blk-exec.c
index 81e31819a597bb0c6ed6dd4f781eb037c986a243..8a0e7ec056e7a3bd6db31f19ec72202ae97c581e 100644 (file)
--- a/block/blk-exec.c
+++ b/block/blk-exec.c
@@ -56,7 +56,7 @@ void blk_execute_rq_nowait(struct request_queue *q, struct gendisk *bd_disk,
        spin_lock_irq(q->queue_lock);
        __elv_add_request(q, rq, where);
        __blk_run_queue(q);
-       /* the queue is stopped so it won't be plugged+unplugged */
+       /* the queue is stopped so it won't be run */
        if (rq->cmd_type == REQ_TYPE_PM_RESUME)
                q->request_fn(q);
        spin_unlock_irq(q->queue_lock);