Merge branch 'linus' into perfcounters/core

Merge reason: merge almost-rc8 into perfcounters/core, which was -rc6
              based - to pick up the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 0 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 6f51ca485f35..e2b50d8f57a8 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -425,6 +425,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
         INIT_LIST_HEAD(&starget->devices);
         starget->state = STARGET_CREATED;
         starget->scsi_level = SCSI_2;
+        starget->max_target_blocked = SCSI_DEFAULT_TARGET_BLOCKED;
  retry:
         spin_lock_irqsave(shost->host_lock, flags);