commit | 82681a318f9f028ea64e61f24bbd9ac535531921 | [log] [tgz] |
---|---|---|
author | James Bottomley <James.Bottomley@HansenPartnership.com> | Fri Jun 12 10:02:03 2009 -0500 |
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | Fri Jun 12 10:02:03 2009 -0500 |
tree | 529b6a5b4fd040fb54b7672b1a224ebd47445876 | |
parent | 3860c97bd60a4525bb62eb90e3e7d2f02662ac59 [diff] | |
parent | 8ebf975608aaebd7feb33d77f07ba21a6380e086 [diff] |
[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: James Bottomley <James.Bottomley@HansenPartnership.com>