diff --git a/[refs] b/[refs]
index d6049b2f2c1d..0cf9d085ed96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76598ebe081b04132f272440183e0aeb6507a079
+refs/heads/master: 52e88f5d4a6b06f3a945728dd3bc403632afe069
diff --git a/trunk/include/asm-generic/bug.h b/trunk/include/asm-generic/bug.h
index a06eecd48292..14fae1fa87df 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("WARNING at %s:%d %s()\n", __FILE__,	\
+		printk("BUG: at %s:%d %s()\n", __FILE__,		\
 			__LINE__, __FUNCTION__);			\
 		dump_stack();						\
 	}								\