diff --git a/[refs] b/[refs]
index 3508c0690706..ce1ffa554923 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb8a88b24bd7e3e7cf65e425f8f12d6a12371738
+refs/heads/master: cf4ca4874fc45166198424384275f443a672d0b7
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index 7d5b10ff63e0..5b57236dfbd0 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -615,17 +615,6 @@ ftrace_vprintk(const char *fmt, va_list ap)
 static inline void ftrace_dump(enum ftrace_dump_mode oops_dump_mode) { }
 #endif /* CONFIG_TRACING */
 
-/*
- *      Display an IP address in readable format.
- */
-
-#define NIPQUAD(addr) \
-	((unsigned char *)&addr)[0], \
-	((unsigned char *)&addr)[1], \
-	((unsigned char *)&addr)[2], \
-	((unsigned char *)&addr)[3]
-#define NIPQUAD_FMT "%u.%u.%u.%u"
-
 /*
  * min()/max()/clamp() macros that also do
  * strict type-checking.. See the