merge by hand (scsi_device.h)

drivers/block/scsi_ioctl.c

drivers/message/i2o/i2o_config.c

drivers/s390/scsi/zfcp_aux.c

drivers/s390/scsi/zfcp_def.h

drivers/s390/scsi/zfcp_erp.c

drivers/s390/scsi/zfcp_fsf.c

drivers/s390/scsi/zfcp_fsf.h

drivers/s390/scsi/zfcp_sysfs_adapter.c

drivers/scsi/53c7xx.c

drivers/scsi/BusLogic.c

drivers/scsi/NCR5380.c

drivers/scsi/advansys.c

drivers/scsi/aha152x.c

drivers/scsi/arm/acornscsi.c

drivers/scsi/arm/fas216.c

drivers/scsi/arm/scsi.h

drivers/scsi/atari_NCR5380.c

drivers/scsi/constants.c

drivers/scsi/ips.c

drivers/scsi/ncr53c8xx.c