Conflicts:

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

Removal of randomness flag conflicts with SA_ -> IRQF_ global
replacement.
Signed-off-by: NJames Bottomley <James.Bottomley@SteelEye.com>