diff --git a/[refs] b/[refs]
index 4188c779d710..19ae7441c980 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8605aef813f8eb3ef4b80d32cba6a671ef8deb0
+refs/heads/master: 30e25b71e725b150585e17888b130e3324f8cf7c
diff --git a/trunk/include/asm-generic/bug.h b/trunk/include/asm-generic/bug.h
index 47e3561638b1..a06eecd48292 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: warning at %s:%d/%s()\n", __FILE__,	\
+		printk("WARNING at %s:%d %s()\n", __FILE__,	\
 			__LINE__, __FUNCTION__);			\
 		dump_stack();						\
 	}								\