Merge branch 'master'

This commit is contained in:
Jeff Garzik
2006-03-01 14:45:47 -05:00
102 changed files with 1479 additions and 1020 deletions

View File

@@ -1803,6 +1803,8 @@ static int ata_dev_supports_fua(u16 *id)
{
unsigned char model[41], fw[9];
if (!libata_fua)
return 0;
if (!ata_id_has_fua(id))
return 0;