]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge ../scsi-misc-2.6
authorJames Bottomley <jejb@mulgrave.il.steeleye.com>
Mon, 3 Jul 2006 14:41:12 +0000 (09:41 -0500)
committerJames Bottomley <jejb@mulgrave.il.steeleye.com>
Mon, 3 Jul 2006 14:41:12 +0000 (09:41 -0500)
commitc4e00fac42f268ed0a547cdd1d12bb8399864040
tree1a54d87be2066c49b71a03764fcb4fc7f9c68c41
parent29454dde27d8e340bb1987bad9aa504af7081eba
parentd6b0c53723753fc0cfda63f56735b225c43e1e9a
Merge ../scsi-misc-2.6

Conflicts:

drivers/scsi/nsp32.c
drivers/scsi/pcmcia/nsp_cs.c

Removal of randomness flag conflicts with SA_ -> IRQF_ global
replacement.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
18 files changed:
drivers/infiniband/ulp/iser/iscsi_iser.c
drivers/message/fusion/mptbase.c
drivers/message/fusion/mptbase.h
drivers/scsi/53c700.c
drivers/scsi/aic7xxx/aic79xx_osm.h
drivers/scsi/atp870u.c
drivers/scsi/lpfc/lpfc_init.c
drivers/scsi/megaraid/megaraid_sas.c
drivers/scsi/nsp32.c
drivers/scsi/pcmcia/nsp_cs.c
drivers/scsi/qla1280.c
drivers/scsi/qla2xxx/qla_def.h
drivers/scsi/qla2xxx/qla_os.c
drivers/scsi/scsi_debug.c
drivers/scsi/scsi_priv.h
drivers/scsi/scsi_scan.c
drivers/scsi/sd.c
drivers/scsi/sg.c