diff --git a/[refs] b/[refs]
index f1e115e0506b..012870ffaa27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 345347c5d767332d7352f220808fe9b5e4af8c6b
+refs/heads/master: 38941c9521e9ee6064b402dd460ac9dd2df89890
diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c
index 83a292904ca9..4a3a5ae7bb45 100644
--- a/trunk/drivers/ata/libata-core.c
+++ b/trunk/drivers/ata/libata-core.c
@@ -3534,7 +3534,7 @@ int sata_link_resume(struct ata_link *link, const unsigned long *params,
 	} while ((scontrol & 0xf0f) != 0x300 && --tries);
 
 	if ((scontrol & 0xf0f) != 0x300) {
-		ata_link_err(link, "failed to resume link (SControl %X)\n",
+		ata_link_warn(link, "failed to resume link (SControl %X)\n",
 			     scontrol);
 		return 0;
 	}