diff --git a/[refs] b/[refs]
index e07cdcd4af2d..378a818bfafa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a185eb4bc84155fff35b602ce99602c010de9634
+refs/heads/master: a31a97381cdf7dceb03b797a8faf9bc8a01c65d1
diff --git a/trunk/block/blk-core.c b/trunk/block/blk-core.c
index b1fd4f5f07d3..a824e49c0d0a 100644
--- a/trunk/block/blk-core.c
+++ b/trunk/block/blk-core.c
@@ -268,8 +268,7 @@ void __generic_unplug_device(struct request_queue *q)
 {
 	if (unlikely(blk_queue_stopped(q)))
 		return;
-
-	if (!blk_remove_plug(q))
+	if (!blk_remove_plug(q) && !blk_queue_nonrot(q))
 		return;
 
 	q->request_fn(q);
@@ -1241,11 +1240,11 @@ static int __make_request(struct request_queue *q, struct bio *bio)
 	if (test_bit(QUEUE_FLAG_SAME_COMP, &q->queue_flags) ||
 	    bio_flagged(bio, BIO_CPU_AFFINE))
 		req->cpu = blk_cpu_to_group(smp_processor_id());
-	if (elv_queue_empty(q))
+	if (!blk_queue_nonrot(q) && elv_queue_empty(q))
 		blk_plug_device(q);
 	add_request(q, req);
 out:
-	if (sync)
+	if (sync || blk_queue_nonrot(q))
 		__generic_unplug_device(q);
 	spin_unlock_irq(q->queue_lock);
 	return 0;