merge by hand (fix up qla_os.c merge error)

diff --cc drivers/block/elevator.c
Simple merge

diff --cc drivers/ieee1394/sbp2.c
Simple merge

diff --cc drivers/scsi/Kconfig
Simple merge

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

diff --cc drivers/scsi/qla2xxx/qla_os.c
index 3c97aa45772dc4aea2b7c4dbd759e76fa46c1745,f12a2b6fa7a06995de0a2a1dbeac71495981ed6d..e6831264f67ca87002b1b96151795035cebf1af6
--- 1/drivers/scsi/qla2xxx/qla_os.c
--- 2/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@@ -519,8 -476,7 +477,7 @@@ qla2xxx_eh_abort(struct scsi_cmnd *cmd
        serial = cmd->serial_number;
  
        /* Check active list for command command. */
-       spin_unlock_irq(ha->host->host_lock);
 -      spin_lock(&ha->hardware_lock);
 +      spin_lock_irqsave(&ha->hardware_lock, flags);
        for (i = 1; i < MAX_OUTSTANDING_COMMANDS; i++) {
                sp = ha->outstanding_cmds[i];
  
@@@ -557,8 -513,8 +514,7 @@@
                            "scsi(%ld:%d:%d): Abort handler timed out -- %lx "
                            "%x.\n", ha->host_no, id, lun, serial, ret);
                }
 -              spin_lock(&ha->hardware_lock);
        }
-       spin_lock_irq(ha->host->host_lock);
  
        qla_printk(KERN_INFO, ha, 
            "scsi(%ld:%d:%d): Abort command issued -- %lx %x.\n", ha->host_no,

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