Merge head 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[sfrench/cifs-2.6.git] / drivers / scsi / scsi_devinfo.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2 v2.6.12-rc2