diff --git a/[refs] b/[refs]
index a6e3c61fb560..2c46bf430c46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ffdc9a64824a373d09f3417ae4377ec83cd9d16
+refs/heads/master: eba7cbe5d8bbc3bc24f46973e44f1566f81d1f56
diff --git a/trunk/drivers/pwm/pwm-vt8500.c b/trunk/drivers/pwm/pwm-vt8500.c
index 548021439f0c..ad14389b7144 100644
--- a/trunk/drivers/pwm/pwm-vt8500.c
+++ b/trunk/drivers/pwm/pwm-vt8500.c
@@ -41,7 +41,7 @@ static inline void pwm_busy_wait(void __iomem *reg, u8 bitmask)
 		cpu_relax();
 
 	if (unlikely(!loops))
-		pr_warning("Waiting for status bits 0x%x to clear timed out\n",
+		pr_warn("Waiting for status bits 0x%x to clear timed out\n",
 			   bitmask);
 }