Merge by hand (whitespace conflicts in libata.h)
[linux-2.6-microblaze.git] / drivers / scsi / scsi_sysctl.c
2005-04-16 Linus TorvaldsLinux-2.6.12-rc2