Merge ../scsi-misc-2.6
James Bottomley authored

Conflicts:

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

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