Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6

This commit is contained in:
Linus Torvalds 2005-11-11 14:04:37 -08:00
commit d72d6f1b56
143 changed files with 1735 additions and 5104 deletions

View file

@ -399,7 +399,7 @@ struct ata_port_operations {
};
struct ata_port_info {
struct scsi_host_template *sht;
struct scsi_host_template *sht;
unsigned long host_flags;
unsigned long pio_mask;
unsigned long mwdma_mask;