diff --git a/[refs] b/[refs]
index ca468bbed0f1..a4514f0caf79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d333fc8d3006296f2893d17817bc0f67cf87f353
+refs/heads/master: 8f53b6fcc49745c19bb2dd2972185ff398160162
diff --git a/trunk/include/asm-generic/bug.h b/trunk/include/asm-generic/bug.h
index 14fae1fa87df..7f30cce52857 100644
--- a/trunk/include/asm-generic/bug.h
+++ b/trunk/include/asm-generic/bug.h
@@ -35,7 +35,7 @@ struct bug_entry {
 #define WARN_ON(condition) ({						\
 	typeof(condition) __ret_warn_on = (condition);			\
 	if (unlikely(__ret_warn_on)) {					\
-		printk("BUG: at %s:%d %s()\n", __FILE__,		\
+		printk("WARNING: at %s:%d %s()\n", __FILE__,		\
 			__LINE__, __FUNCTION__);			\
 		dump_stack();						\
 	}								\