Merge by hand (conflicts in scsi_lib.c)
[linux-2.6] / drivers / ide / pci / pdc202xx_old.c
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2