James Bottomley c4e00fac42 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>

2006-07-03 09:41:12 -05:00

..

ipoib

Remove obsolete #include <linux/config.h>

2006-06-30 19:25:36 +02:00

iser

Merge ../scsi-misc-2.6

2006-07-03 09:41:12 -05:00

srp

IB/srp: Factor out common request reset code

2006-06-17 20:37:38 -07:00