Merge by hand (conflicts in sd.c)
[pandora-kernel.git] / drivers / scsi / 53c7xx.h
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2