diff options
| author | James Bottomley | 2009-06-12 17:02:03 +0200 |
|---|---|---|
| committer | James Bottomley | 2009-06-12 17:02:03 +0200 |
| commit | 82681a318f9f028ea64e61f24bbd9ac535531921 (patch) | |
| tree | 529b6a5b4fd040fb54b7672b1a224ebd47445876 /drivers/scsi/mpt2sas/mpt2sas_ctl.c | |
| parent | [SCSI] osd: Remove out-of-tree left overs (diff) | |
| parent | block: fix kernel-doc in recent block/ changes (diff) | |
| download | kernel-qcow2-linux-82681a318f9f028ea64e61f24bbd9ac535531921.tar.gz kernel-qcow2-linux-82681a318f9f028ea64e61f24bbd9ac535531921.tar.xz kernel-qcow2-linux-82681a318f9f028ea64e61f24bbd9ac535531921.zip | |
[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>
Diffstat (limited to 'drivers/scsi/mpt2sas/mpt2sas_ctl.c')
0 files changed, 0 insertions, 0 deletions