Merge ../scsi-misc-2.6

Browse Source

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>

...

This commit is contained in:

James Bottomley

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

parent 29454dde27 d6b0c53723

commit c4e00fac42

74 changed files with 4528 additions and 2890 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

drivers/scsi/scsi_debug.c

+1028 -195

File diff suppressed because it is too large Load Diff