Skip to content
Snippets Groups Projects
Commit c4e00fac authored by James Bottomley's avatar James Bottomley
Browse files

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: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parents 29454dde d6b0c537
No related branches found
No related tags found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1298 additions and 673 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment