merge by hand (fix up qla_os.c merge error)
[pandora-kernel.git] / drivers / scsi / mac_scsi.c
2005-06-17 James Bottomleymerge by hand (fix up qla_os.c merge error)
2005-06-17 Jeff Garzik [SCSI] Remove no-op implementations of SCSI EH hooks
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2