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>

diff --cc drivers/infiniband/ulp/iser/iscsi_iser.c
Simple merge

diff --cc drivers/message/fusion/mptbase.c
Simple merge

diff --cc drivers/message/fusion/mptbase.h
Simple merge

diff --cc drivers/scsi/53c700.c
Simple merge

diff --cc drivers/scsi/aic7xxx/aic79xx_osm.h
Simple merge

diff --cc drivers/scsi/atp870u.c
Simple merge

diff --cc drivers/scsi/lpfc/lpfc_init.c
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas.c
Simple merge

diff --cc drivers/scsi/nsp32.c
index bd337a91429855f290859ea03b9e377cd1c6eda9,4190788f14be5087f2491f841c785c2870397623..bfb4f49e125d28b82a5dea1472641c1d43e45339
--- 1/drivers/scsi/nsp32.c
--- 2/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@@ -2866,8 -2866,7 +2866,7 @@@ static int nsp32_detect(struct scsi_hos
         */
        nsp32_do_bus_reset(data);
  
-       ret = request_irq(host->irq, do_nsp32_isr,
-                         IRQF_SHARED | IRQF_SAMPLE_RANDOM, "nsp32", data);
 -      ret = request_irq(host->irq, do_nsp32_isr, SA_SHIRQ, "nsp32", data);
++      ret = request_irq(host->irq, do_nsp32_isr, IRQF_SHARED, "nsp32", data);
        if (ret < 0) {
                nsp32_msg(KERN_ERR, "Unable to allocate IRQ for NinjaSCSI32 "
                          "SCSI PCI controller. Interrupt: %d", host->irq);

diff --cc drivers/scsi/pcmcia/nsp_cs.c
index 7ff5851c040b290dcbf532c31de00d9a5a0e3fb2,bb81218b8d1968b1540b7edbc55f6698e2a9c91b..0d4c04e1f3de3f941655ec67a023992e77d46f04
--- 1/drivers/scsi/pcmcia/nsp_cs.c
--- 2/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@@ -1623,7 -1623,7 +1623,7 @@@ static int nsp_cs_probe(struct pcmcia_d
        /* Interrupt handler */
        link->irq.Handler        = &nspintr;
        link->irq.Instance       = info;
-       link->irq.Attributes     |= (IRQF_SHARED | IRQF_SAMPLE_RANDOM);
 -      link->irq.Attributes     |= SA_SHIRQ;
++      link->irq.Attributes     |= IRQF_SHARED;
  
        /* General socket configuration */
        link->conf.Attributes    = CONF_ENABLE_IRQ;

diff --cc drivers/scsi/qla1280.c
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_def.h
Simple merge

diff --cc drivers/scsi/qla2xxx/qla_os.c
Simple merge

diff --cc drivers/scsi/scsi_debug.c
Simple merge

diff --cc drivers/scsi/scsi_priv.h
Simple merge

diff --cc drivers/scsi/scsi_scan.c
Simple merge

diff --cc drivers/scsi/sd.c
Simple merge

diff --cc drivers/scsi/sg.c
Simple merge