Conflicts in dec_esp.c (Thanks Bacchus), scsi_transport_iscsi.c and
scsi_transport_fc.h
Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>