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

..

aha152x_core.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

aha152x_stub.c

[PATCH] pcmcia: use bitfield instead of p_state and state

2006-03-31 17:26:33 +02:00

fdomain_core.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

fdomain_stub.c

[PATCH] pcmcia: use bitfield instead of p_state and state

2006-03-31 17:26:33 +02:00

Kconfig

[SCSI] scsi: aha152x pcmcia driver needs spi transport

2006-03-05 08:00:47 -06:00

Makefile

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

nsp_cs.c

Merge ../scsi-misc-2.6

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

nsp_cs.h

[PATCH] pcmcia: add return value to _config() functions

2006-03-31 17:26:06 +02:00

nsp_debug.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

nsp_io.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

nsp_message.c

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

qlogic_stub.c

[PATCH] pcmcia: use bitfield instead of p_state and state

2006-03-31 17:26:33 +02:00

sym53c500_cs.c

[PATCH] irq-flags: scsi: Use the new IRQF_ constants

2006-07-02 13:58:53 -07:00