Merge by hand (conflicts in sr.c)
[linux-3.10.git] / drivers / scsi / sr.c
2005-08-28 James BottomleyMerge by hand (conflicts in sr.c)
2005-08-28 James Bottomley[SCSI] convert sr to scsi_execute_req
2005-08-28 James Bottomley[SCSI] convert the remaining mid-layer pieces to scsi_e...
2005-08-28 Pete Zaitcev[SCSI] sr.c: Fix getting wrong size
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 master