diff --git a/[refs] b/[refs] index 948075dcbed5..37ccfb56a38e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7fe7ad4bcaba17f05d5cbf1119772c645783b08 +refs/heads/master: e41bd3e854e3536de847d5831c0e25a47f394885 diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index b0d1dc3cdb2d..99a18cea316a 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -4150,6 +4150,7 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "HITACHI HDS7250SASUN500G*", NULL, ATA_HORKAGE_NONCQ }, { "HITACHI HDS7225SBSUN250G*", NULL, ATA_HORKAGE_NONCQ }, { "ST380817AS", "3.42", ATA_HORKAGE_NONCQ }, + { "ST3160023AS", "3.42", ATA_HORKAGE_NONCQ }, /* Blacklist entries taken from Silicon Image 3124/3132 Windows driver .inf file - also several Linux problem reports */