diff --git a/[refs] b/[refs] index a9d3231226be..7655aafbb4ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5aa06930fbcfcb6b03fcb18b753122b10ac47a87 +refs/heads/master: 1a14703d6b20010401ca273ac1f07bff7992aa2c diff --git a/trunk/drivers/platform/x86/intel_ips.c b/trunk/drivers/platform/x86/intel_ips.c index 03448224aedb..afe82e50dfea 100644 --- a/trunk/drivers/platform/x86/intel_ips.c +++ b/trunk/drivers/platform/x86/intel_ips.c @@ -607,7 +607,7 @@ static bool mcp_exceeded(struct ips_driver *ips) spin_unlock_irqrestore(&ips->turbo_status_lock, flags); if (ret) - dev_warn(&ips->dev->dev, + dev_info(&ips->dev->dev, "MCP power or thermal limit exceeded\n"); return ret; @@ -635,7 +635,7 @@ static bool cpu_exceeded(struct ips_driver *ips, int cpu) spin_unlock_irqrestore(&ips->turbo_status_lock, flags); if (ret) - dev_warn(&ips->dev->dev, + dev_info(&ips->dev->dev, "CPU power or thermal limit exceeded\n"); return ret;