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
..
Kconfig.megaraid	[SCSI] megaraid_{mbox,mm} : remove PCI Id overlaping between megaraid_legacy and megaraid_{mbox,mm}	2005-12-13 18:10:56 -07:00
Makefile
mbox_defs.h
mega_common.h	Merge by hand (whitespace conflicts in libata.h)	2005-11-10 08:29:07 -06:00
megaraid_ioctl.h
megaraid_mbox.c	[PATCH] irq-flags: scsi: Use the new IRQF_ constants	2006-07-02 13:58:53 -07:00
megaraid_mbox.h	[SCSI] megaraid_{mm,mbox}: fix a bug in reset handler	2006-04-27 14:08:53 -05:00
megaraid_mm.c	[SCSI] megaraid/megaraid_mm.c: fix a NULL pointer dereference	2006-04-19 20:32:00 -04:00
megaraid_mm.h	[PATCH] don't include ioctl32.h in drivers	2006-01-10 08:01:34 -08:00
megaraid_sas.c	Merge ../scsi-misc-2.6	2006-07-03 09:41:12 -05:00
megaraid_sas.h	[SCSI] megaraid_sas: zcr with fix	2006-06-26 09:29:07 -05:00