tree 1a54d87be2066c49b71a03764fcb4fc7f9c68c41
parent 29454dde27d8e340bb1987bad9aa504af7081eba
parent d6b0c53723753fc0cfda63f56735b225c43e1e9a
author James Bottomley <jejb@mulgrave.il.steeleye.com> 1151937672 -0500
committer James Bottomley <jejb@mulgrave.il.steeleye.com> 1151937672 -0500

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>