Merge branch 'master' into for-2.6.31

Conflicts:
	drivers/block/hd.c
	drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index d7c6c752e0a6..dd3f9d2b99fd 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1262,10 +1262,8 @@ static inline int scsi_target_queue_ready(struct Scsi_Host *shost,
                 if (--starget->target_blocked == 0) {
                         SCSI_LOG_MLQUEUE(3, starget_printk(KERN_INFO, starget,
                                          "unblocking target at zero depth\n"));
-                } else {
-                        blk_plug_device(sdev->request_queue);
+                } else
                         return 0;
-                }
         }
 
         if (scsi_target_is_busy(starget)) {