]> git.baikalelectronics.ru Git - kernel.git/commit
[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)
commite472caa2e8a006ceef9dd9e177d0f7f6efab092a
tree529b6a5b4fd040fb54b7672b1a224ebd47445876
parent1c9edc2953aaed9f7f068d444eb5e567c6f8b076
parent64e0744da44d0169f5f7393466a487140846550f
[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
drivers/net/Makefile
drivers/scsi/lpfc/lpfc_scsi.c
drivers/scsi/mpt2sas/mpt2sas_transport.c
drivers/scsi/osd/osd_initiator.c
drivers/scsi/scsi_lib.c
drivers/scsi/sd.c
drivers/scsi/st.c
fs/exofs/osd.c