projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3860c97 8ebf975)
[SCSI] Merge branch 'linus'
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Fri, 12 Jun 2009 15:02:03 +0000 (10:02 -0500)
committerJames Bottomley <James.Bottomley@HansenPartnership.com>
Fri, 12 Jun 2009 15:02:03 +0000 (10:02 -0500)
commit82681a318f9f028ea64e61f24bbd9ac535531921
tree529b6a5b4fd040fb54b7672b1a224ebd47445876tree | snapshot
parent3860c97bd60a4525bb62eb90e3e7d2f02662ac59commit | diff
parent8ebf975608aaebd7feb33d77f07ba21a6380e086commit | 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>
drivers/message/fusion/mptsas.c diff1 | diff2 | blob | history
drivers/net/Makefile diff1 | diff2 | blob | history
drivers/scsi/lpfc/lpfc_scsi.c diff1 | diff2 | blob | history
drivers/scsi/mpt2sas/mpt2sas_transport.c diff1 | diff2 | blob | history
drivers/scsi/osd/osd_initiator.c diff1 | diff2 | blob | history
drivers/scsi/scsi_lib.c diff1 | diff2 | blob | history
drivers/scsi/sd.c diff1 | diff2 | blob | history
drivers/scsi/st.c diff1 | diff2 | blob | history
fs/exofs/osd.c diff1 | diff2 | blob | history
Making Linux better for my computers