merge by hand (qla_os.c mismerge)
[profile/ivi/kernel-x86-ivi.git] / drivers / scsi / sata_promise.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2