Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
[linux-2.6] / drivers / scsi / osst_detect.h
2005-04-16  Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2