Skip to content
GitLab
Commit 82681a31 authored by James Bottomley's avatar James Bottomley
Browse files

[SCSI] Merge branch 'linus' 



Conflicts:
	drivers/message/fusion/mptsas.c

fixed up conflict between req->data_len accessors and mptsas driver updates.

Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parents 3860c97b 8ebf9756
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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