[SCSI] qla4xxx: Added support for ISP8042

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

diff --cc drivers/scsi/qla4xxx/ql4_83xx.c
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_attr.c
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_dbg.c
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_def.h
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_init.c
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_isr.c
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_mbx.c
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_nx.c
Simple merge

diff --cc drivers/scsi/qla4xxx/ql4_os.c
Simple merge