Merge by Hand

Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 65e845665b85..fc0f30ae0f77 100644
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -830,7 +830,7 @@ static int imm_engine(imm_struct *dev, struct scsi_cmnd *cmd)
 
                 /* Phase 2 - We are now talking to the scsi bus */
         case 2:
-                if (!imm_select(dev, cmd->device->id)) {
+                if (!imm_select(dev, scmd_id(cmd))) {
                         imm_fail(dev, DID_NO_CONNECT);
                         return 0;
                 }