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
..
core	IB/core: Set alternate port number when initializing QP attributes	2006-06-30 14:10:14 -07:00
hw	[PATCH] irq-flags: misc drivers: Use the new IRQF_ constants	2006-07-02 13:58:50 -07:00
ulp	Merge ../scsi-misc-2.6	2006-07-03 09:41:12 -05:00
Kconfig	IB/iser: iSER Kconfig and Makefile	2006-06-22 07:51:14 -07:00
Makefile	IB/iser: iSER Kconfig and Makefile	2006-06-22 07:51:14 -07:00