linux-sg2042/drivers/message
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
..
fusion Merge ../scsi-misc-2.6 2006-07-03 09:41:12 -05:00
i2o [PATCH] irq-flags: misc drivers: Use the new IRQF_ constants 2006-07-02 13:58:50 -07:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00