Merge ../linux-2.6-watchdog-mm
[linux-2.6] / drivers / scsi / initio.c
2005-06-17  James Bottomleymerge by hand (fix up qla_os.c merge error)
2005-06-17  Jeff Garzik [SCSI] allow sleeping in ->eh_bus_reset_handler()
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2