mirror of
https://github.com/ukui/kernel.git
synced 2026-03-09 10:07:04 -07:00
096cbc35ea
Conflicts: drivers/scsi/scsi_debug.c Agreed and tested resolution to a merge problem between a fix in scsi_debug and a driver update Signed-off-by: James Bottomley <JBottomley@Parallels.com>